From 1a2139234ea75570fb9099306c84ffaf82d35f9c Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Mon, 2 Nov 2015 13:01:38 +0100 Subject: [PATCH] - Some rendering adjustments --- .../client/util/FamiliarHandlerClient.java | 6 +++++- .../common/blocks/tiles/TileExtendedNode.java | 2 +- .../common/blocks/tiles/TileNodeManipulator.java | 2 +- .../common/items/baubles/ItemFamiliar.java | 3 --- .../common/network/packets/PacketFamiliar.java | 12 +++++++++++- .../common/network/packets/PacketTCNodeBolt.java | 16 ++++++++++++++-- .../common/node/GrowingNodeBehavior.java | 2 +- .../registration/RegisteredFamiliarAI.java | 2 +- .../gadomancy/common/utils/ExplosionHelper.java | 2 +- 9 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java index 61397e2..a78d928 100644 --- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -18,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import thaumcraft.api.aspects.Aspect; +import thaumcraft.client.fx.bolt.FXLightningBolt; import thaumcraft.client.renderers.entity.RenderPrimalOrb; import thaumcraft.client.renderers.entity.RenderWisp; import thaumcraft.common.Thaumcraft; @@ -53,7 +54,10 @@ public class FamiliarHandlerClient { if(p == null || p.getDistanceSqToEntity(Minecraft.getMinecraft().thePlayer) > 1024) return; //32^2 PartialEntityFamiliar fam = clientFamiliars.get(p.getCommandSenderName()); if(fam == null) return; - Thaumcraft.proxy.nodeBolt(Minecraft.getMinecraft().theWorld, (float) fam.posX, (float) fam.posY, (float) fam.posZ, pkt.targetX, pkt.targetY, pkt.targetZ); + FXLightningBolt bolt = new FXLightningBolt(Minecraft.getMinecraft().theWorld, (float) fam.posX, (float) fam.posY, (float) fam.posZ, pkt.targetX, pkt.targetY, pkt.targetZ, Minecraft.getMinecraft().theWorld.rand.nextLong(), 10, 4.0F, 5); + bolt.defaultFractal(); + bolt.setType(pkt.type); + bolt.finalizeBolt(); } else if(packet instanceof PacketFamiliar.PacketFamiliarSyncCompletely) { PacketFamiliar.PacketFamiliarSyncCompletely sync = (PacketFamiliar.PacketFamiliarSyncCompletely) packet; familiarPlayers = sync.playerNamesWithFamiliars; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java index 2171a2b..b6b1050 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -106,7 +106,7 @@ public class TileExtendedNode extends TileNode implements INode { worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "thaumcraft:zap", 0.8F, 1.0F); - PacketTCNodeBolt packet = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 0.5F, zCoord + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ); + PacketTCNodeBolt packet = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 0.5F, zCoord + 0.5F, (float) livingEntity.posX, (float) (livingEntity.posY + livingEntity.height), (float) livingEntity.posZ, 0, false); PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 32.0D)); } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java index 6cf252c..08f9270 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -81,7 +81,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont } if(worldObj.rand.nextInt(4) == 0) { Vec3 rel = getRelPillarLoc(worldObj.rand.nextInt(4)); - PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord)); + PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord), 0, false); PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32)); } } else { diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java index bcbfb12..6e4a968 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java @@ -48,7 +48,6 @@ public class ItemFamiliar extends Item implements IBauble { } if(stack.getTagCompound().hasKey("AttackUpgrade1") || stack.getTagCompound().hasKey("AttackUpgrade2") || stack.getTagCompound().hasKey("AttackUpgrade3")) { - lore.add(""); String strength = EnumChatFormatting.DARK_RED + "Strength "; if(stack.getTagCompound().hasKey("AttackUpgrade1")) strength += "I"; if(stack.getTagCompound().hasKey("AttackUpgrade2")) strength += "I"; @@ -57,12 +56,10 @@ public class ItemFamiliar extends Item implements IBauble { } if(stack.getTagCompound().hasKey("RangeUpgrade1")) { - lore.add(""); lore.add(EnumChatFormatting.GOLD + "Reach I"); } if(stack.getTagCompound().hasKey("CdUpgrade1")) { - lore.add(""); lore.add(EnumChatFormatting.AQUA + "Swiftness I"); } } diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliar.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliar.java index eaae402..8c5928a 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliar.java @@ -22,15 +22,19 @@ public abstract class PacketFamiliar { public static class PacketFamiliarBolt extends PacketFamiliar implements IMessage, IMessageHandler { public float targetX, targetY, targetZ; + public int type; + public boolean mightGetLong; public String owner; public PacketFamiliarBolt() {} - public PacketFamiliarBolt(String whoseFamiliar, float targetX, float targetY, float targetZ) { + public PacketFamiliarBolt(String whoseFamiliar, float targetX, float targetY, float targetZ, int type, boolean mightGetLong) { this.targetX = targetX; this.targetY = targetY; this.targetZ = targetZ; this.owner = whoseFamiliar; + this.type = type; + this.mightGetLong = mightGetLong; } @Override @@ -39,6 +43,9 @@ public abstract class PacketFamiliar { this.targetY = buf.readFloat(); this.targetZ = buf.readFloat(); + this.type = buf.readInt(); + this.mightGetLong = buf.readBoolean(); + int length = buf.readInt(); byte[] strBytes = new byte[length]; buf.readBytes(strBytes, 0, length); @@ -51,6 +58,9 @@ public abstract class PacketFamiliar { buf.writeFloat(targetY); buf.writeFloat(targetZ); + buf.writeInt(type); + buf.writeBoolean(mightGetLong); + byte[] str = owner.getBytes(); buf.writeInt(str.length); buf.writeBytes(str); diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java index 734d42c..1cdadde 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java @@ -9,6 +9,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.util.Vec3; import net.minecraftforge.common.DimensionManager; +import thaumcraft.client.fx.bolt.FXLightningBolt; import thaumcraft.common.Thaumcraft; /** @@ -23,16 +24,20 @@ public class PacketTCNodeBolt implements IMessage, IMessageHandler