From 95c77249bc78697ef511cd255fc18a3393a27958 Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Sun, 1 Nov 2015 12:46:16 +0100 Subject: [PATCH] - Familiars: Rendering forwarded to RenderPrimalOrb from TC until own render is written - Familiars: Now properly controlled by Server and mirrored to clients. --- .../makeo/gadomancy/client/ClientProxy.java | 8 +- .../client/events/ClientTickHandler.java | 24 +++ .../client/events/RenderEventHandler.java | 7 + .../item/familiar/FamiliarHandlerClient.java | 62 ------- .../client/util/FamiliarHandlerClient.java | 162 ++++++++++++++++++ .../makeo/gadomancy/common/CommonProxy.java | 8 +- .../common/blocks/tiles/TileExtendedNode.java | 3 + .../common/events/EventHandlerNetwork.java | 11 ++ .../common/familiar/FamiliarHandler.java | 25 --- .../familiar/FamiliarHandlerServer.java | 71 ++++++-- .../common/items/baubles/ItemFamiliar.java | 6 +- .../common/network/PacketHandler.java | 2 + .../network/packets/PacketFamiliar.java | 98 ++++++++++- .../registration/RegisteredFamiliarAI.java | 6 +- 14 files changed, 369 insertions(+), 124 deletions(-) create mode 100644 src/main/java/makeo/gadomancy/client/events/ClientTickHandler.java delete mode 100644 src/main/java/makeo/gadomancy/client/renderers/item/familiar/FamiliarHandlerClient.java create mode 100644 src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java delete mode 100644 src/main/java/makeo/gadomancy/common/familiar/FamiliarHandler.java diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index dfa71e3..c8ede9d 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -3,7 +3,9 @@ package makeo.gadomancy.client; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; +import makeo.gadomancy.client.events.ClientTickHandler; import makeo.gadomancy.client.events.RenderEventHandler; import makeo.gadomancy.client.events.ResourceReloadListener; import makeo.gadomancy.client.gui.InfusionClawGui; @@ -11,7 +13,7 @@ import makeo.gadomancy.client.renderers.block.BlockExtendedNodeJarRenderer; import makeo.gadomancy.client.renderers.block.RenderBlockTransparent; import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase; import makeo.gadomancy.client.renderers.item.*; -import makeo.gadomancy.client.renderers.item.familiar.FamiliarHandlerClient; +import makeo.gadomancy.client.util.FamiliarHandlerClient; import makeo.gadomancy.client.renderers.tile.*; import makeo.gadomancy.common.CommonProxy; import makeo.gadomancy.common.blocks.tiles.*; @@ -55,8 +57,6 @@ public class ClientProxy extends CommonProxy { public void initalize() { super.initalize(); - familiarHandler = new FamiliarHandlerClient(); //Overwriting the server sided one. - injectGolemTextures(); //Tiles @@ -114,6 +114,8 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new RenderEventHandler()); + FMLCommonHandler.instance().bus().register(new ClientTickHandler()); + super.postInitalize(); } diff --git a/src/main/java/makeo/gadomancy/client/events/ClientTickHandler.java b/src/main/java/makeo/gadomancy/client/events/ClientTickHandler.java new file mode 100644 index 0000000..349a199 --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/events/ClientTickHandler.java @@ -0,0 +1,24 @@ +package makeo.gadomancy.client.events; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import makeo.gadomancy.client.util.FamiliarHandlerClient; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by HellFirePvP @ 01.11.2015 10:41 + */ +public class ClientTickHandler { + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if(event.phase.equals(TickEvent.Phase.END)) { + FamiliarHandlerClient.playerTickEvent(); + } + } + +} diff --git a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java index 27d05d7..e974ca8 100644 --- a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java @@ -2,6 +2,7 @@ package makeo.gadomancy.client.events; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import makeo.gadomancy.client.util.ExtendedTypeDisplayManager; +import makeo.gadomancy.client.util.FamiliarHandlerClient; import makeo.gadomancy.client.util.MultiTickEffectDispatcher; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; @@ -12,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -89,4 +91,9 @@ public class RenderEventHandler { ExtendedTypeDisplayManager.notifyRenderTick(); MultiTickEffectDispatcher.notifyRenderTick(Minecraft.getMinecraft().theWorld, event.partialTicks); } + + @SubscribeEvent + public void playerRenderEvent(RenderPlayerEvent.Post renderEvent) { + FamiliarHandlerClient.playerRenderEvent(renderEvent.entityPlayer, renderEvent.partialRenderTick); + } } diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/familiar/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/renderers/item/familiar/FamiliarHandlerClient.java deleted file mode 100644 index a64cddf..0000000 --- a/src/main/java/makeo/gadomancy/client/renderers/item/familiar/FamiliarHandlerClient.java +++ /dev/null @@ -1,62 +0,0 @@ -package makeo.gadomancy.client.renderers.item.familiar; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import makeo.gadomancy.common.familiar.FamiliarHandlerServer; -import makeo.gadomancy.common.network.packets.PacketFamiliar; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import thaumcraft.common.Thaumcraft; - -/** - * This class is part of the Gadomancy Mod - * Gadomancy is Open Source and distributed under the - * GNU LESSER GENERAL PUBLIC LICENSE - * for more read the LICENSE file - * - * Created by HellFirePvP @ 31.10.2015 12:13 - */ -public class FamiliarHandlerClient extends FamiliarHandlerServer { - - //TODO has to handle rendering and processing of animation packets. - - @Override - public void setupPostInit() { - super.setupPostInit(); - - - } - - @Override - public void notifyEquip(World world, ItemStack familiarStack, EntityPlayer player) { - super.notifyEquip(world, familiarStack, player); - - - } - - @Override - public void notifyUnequip(World world, ItemStack familiarStack, EntityPlayer player) { - super.notifyUnequip(world, familiarStack, player); - - - } - - @Override - public void equippedTick(World world, ItemStack familiarStack, EntityPlayer player) { - super.equippedTick(world, familiarStack, player); - - - } - - @SideOnly(Side.CLIENT) - public void processPacket(PacketFamiliar packet) { - if(packet instanceof PacketFamiliar.PacketFamiliarBolt) { - PacketFamiliar.PacketFamiliarBolt pkt = (PacketFamiliar.PacketFamiliarBolt) packet; - EntityPlayer p = Minecraft.getMinecraft().thePlayer; - Thaumcraft.proxy.nodeBolt(Minecraft.getMinecraft().theWorld, (float) p.posX, (float) (p.posY + p.eyeHeight), (float) p.posZ, pkt.targetX, pkt.targetY, pkt.targetZ); - //TODO zap given coordinates from current familiar render coordinates - } - } -} diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java new file mode 100644 index 0000000..4f532bc --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -0,0 +1,162 @@ +package makeo.gadomancy.client.util; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.network.packets.PacketFamiliar; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import thaumcraft.client.renderers.entity.RenderPrimalOrb; +import thaumcraft.common.Thaumcraft; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + * + * Created by HellFirePvP @ 31.10.2015 12:13 + */ +public class FamiliarHandlerClient { + + private static RenderPrimalOrb fallbackRenderer; + + private static Map clientFamiliars = new HashMap(); + private static List familiarPlayers = new ArrayList(); + + @SideOnly(Side.CLIENT) + public static void processPacket(PacketFamiliar packet) { + if(packet instanceof PacketFamiliar.PacketFamiliarBolt) { + PacketFamiliar.PacketFamiliarBolt pkt = (PacketFamiliar.PacketFamiliarBolt) packet; + EntityPlayer p = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(pkt.owner); + 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); + //TODO zap given coordinates from current familiar render coordinates + } else if(packet instanceof PacketFamiliar.PacketFamiliarSyncCompletely) { + PacketFamiliar.PacketFamiliarSyncCompletely sync = (PacketFamiliar.PacketFamiliarSyncCompletely) packet; + familiarPlayers = sync.playerNamesWithFamiliars; + } else if(packet instanceof PacketFamiliar.PacketFamiliarSyncSingle) { + PacketFamiliar.PacketFamiliarSyncSingle sync = (PacketFamiliar.PacketFamiliarSyncSingle) packet; + String value = sync.name; + if(sync.status) { + if(!familiarPlayers.contains(value)) { + familiarPlayers.add(value); + clientFamiliars.put(value, new PartialEntityFamiliar(Minecraft.getMinecraft().theWorld.getPlayerEntityByName(value), value)); + } + } else { + clientFamiliars.remove(value); + familiarPlayers.remove(value); + } + } + } + + @SideOnly(Side.CLIENT) + public static void playerRenderEvent(EntityPlayer player, float partialTicks) { //RenderPlayerEvent.Post + EntityLivingBase renderView = Minecraft.getMinecraft().renderViewEntity; + for(String ownerName : clientFamiliars.keySet()) { + PartialEntityFamiliar fam = clientFamiliars.get(ownerName); + + if(!ownerName.equals(player.getCommandSenderName())) continue; + if(renderView.worldObj.provider.dimensionId != player.worldObj.provider.dimensionId) continue; + if(renderView.getDistanceSqToEntity(player) > 1024) continue; + + fallbackRenderer.renderEntityAt(fam.dummyEntity, fam.renderX, fam.renderY, fam.renderZ, 0, partialTicks); + //Render at abs positions: ram.posX, fam.posY, fam.posZ + } + } + + @SideOnly(Side.CLIENT) + public static void playerTickEvent() { + for(PartialEntityFamiliar fam : clientFamiliars.values()) fam.tick(); + } + + static { + fallbackRenderer = new RenderPrimalOrb(); + fallbackRenderer.setRenderManager(RenderManager.instance); + } + + public static class DummyEntityFamiliar extends Entity { + + public DummyEntityFamiliar(World p_i1582_1_) { + super(p_i1582_1_); + } + + @Override + protected void entityInit() {} + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {} + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {} + } + + @SideOnly(Side.CLIENT) + public static class PartialEntityFamiliar { + + private static final double RAD_CAP = 2 * Math.PI; + private static final int CRICLE_TIME_TICKS = 160; + private static final double RADIUS = 1; + + public DummyEntityFamiliar dummyEntity = new DummyEntityFamiliar(null); + public WeakReference owner; + public String potentialOwnerName; + public double posX, posY, posZ; + public double renderX, renderY, renderZ; + public double prevPosX, prevPosY, prevPosZ; + public int ticksExisted = 0; + + public PartialEntityFamiliar(EntityPlayer owner, String ownerNameToSearch) { + this.owner = new WeakReference(owner); + this.potentialOwnerName = ownerNameToSearch; + } + + public void tick() { + ticksExisted++; + dummyEntity.ticksExisted = ticksExisted; + + if(owner.get() == null) { + if(potentialOwnerName != null) { + EntityPlayer player = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(potentialOwnerName); + if(player != null) { + owner = new WeakReference(player); + } + } else { + return; + } + } else { + if(owner.get().worldObj.provider.dimensionId != Minecraft.getMinecraft().renderViewEntity.worldObj.provider.dimensionId) { + owner = new WeakReference(null); + return; + } + } + + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + double part = ((double) ticksExisted) / ((double) CRICLE_TIME_TICKS); + double theta = RAD_CAP * part; + this.renderX = RADIUS * Math.cos(theta); + this.renderZ = RADIUS * Math.sin(theta); + this.renderY = 1 + Math.sin(theta * 2) / 4D; + + this.posX = owner.get().posX + renderX; + this.posZ = owner.get().posZ + renderZ; + this.posY = owner.get().posY + renderY; + } + } + +} diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 0f9170e..080ea15 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -3,14 +3,12 @@ package makeo.gadomancy.common; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import makeo.gadomancy.common.containers.ContainerInfusionClaw; import makeo.gadomancy.common.events.EventHandlerEntity; import makeo.gadomancy.common.events.EventHandlerGolem; import makeo.gadomancy.common.events.EventHandlerNetwork; import makeo.gadomancy.common.events.EventHandlerWorld; -import makeo.gadomancy.common.familiar.FamiliarHandler; import makeo.gadomancy.common.familiar.FamiliarHandlerServer; import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.registration.*; @@ -18,14 +16,10 @@ import makeo.gadomancy.client.ClientProxy; import makeo.gadomancy.common.utils.Injector; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import thaumcraft.api.wands.WandTriggerRegistry; -import thaumcraft.common.blocks.BlockAiryItem; -import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.entities.golems.ContainerGolem; import thaumcraft.common.entities.golems.EntityGolemBase; @@ -43,7 +37,7 @@ import java.util.List; */ public class CommonProxy implements IGuiHandler { public static final EventHandlerGolem EVENT_HANDLER_GOLEM = new EventHandlerGolem(); - public FamiliarHandler familiarHandler; + public FamiliarHandlerServer familiarHandler; public void onConstruct() { } 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 3a76127..2171a2b 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -103,6 +103,9 @@ public class TileExtendedNode extends TileNode implements INode { ResearchHelper.distributeResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_AGGRESSION", worldObj, xCoord, yCoord, zCoord, 6); livingEntity.attackEntityFrom(DamageSource.magic, behavior.getZapDamage()); + + 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); PacketHandler.INSTANCE.sendToAllAround(packet, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 32.0D)); } diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java index 0b80f1f..706cfa2 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java @@ -2,9 +2,12 @@ package makeo.gadomancy.common.events; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketFamiliar; import makeo.gadomancy.common.network.packets.PacketUpdateGolemTypeOrder; import makeo.gadomancy.common.utils.GolemEnumHelper; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; /** @@ -21,6 +24,14 @@ public class EventHandlerNetwork { EntityPlayerMP p = (EntityPlayerMP) e.player; if(!p.playerNetServerHandler.netManager.isLocalChannel()) { PacketHandler.INSTANCE.sendTo(new PacketUpdateGolemTypeOrder(GolemEnumHelper.getCurrentMapping()), p); + Gadomancy.proxy.familiarHandler.checkPlayerEquipment(p); + PacketHandler.INSTANCE.sendTo(new PacketFamiliar.PacketFamiliarSyncCompletely(Gadomancy.proxy.familiarHandler.getCurrentActiveFamiliars()), p); } } + + @SubscribeEvent + public void on(PlayerEvent.PlayerLoggedOutEvent e) { + EntityPlayer player = e.player; + Gadomancy.proxy.familiarHandler.notifyUnequip(player.worldObj, player); + } } diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandler.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandler.java deleted file mode 100644 index adc0a69..0000000 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package makeo.gadomancy.common.familiar; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * This class is part of the Gadomancy Mod - * Gadomancy is Open Source and distributed under the - * GNU LESSER GENERAL PUBLIC LICENSE - * for more read the LICENSE file - *

- * Created by HellFirePvP @ 31.10.2015 12:11 - */ -public interface FamiliarHandler { - - public void setupPostInit(); - - public void notifyEquip(World world, ItemStack familiarStack, EntityPlayer player); - - public void notifyUnequip(World world, ItemStack familiarStack, EntityPlayer player); - - public void equippedTick(World world, ItemStack familiarStack, EntityPlayer player); - -} diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandlerServer.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandlerServer.java index 6ada8ce..7bb03e0 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandlerServer.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarHandlerServer.java @@ -1,12 +1,18 @@ package makeo.gadomancy.common.familiar; import baubles.api.BaublesApi; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketFamiliar; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -17,44 +23,77 @@ import java.util.Map; * * Created by HellFirePvP @ 31.10.2015 12:10 */ -public class FamiliarHandlerServer implements FamiliarHandler { +public class FamiliarHandlerServer { + private List activeFamiliars = new ArrayList(); private Map familiarAI; - //TODO has to handle attacks, protection, ... - @Override public void setupPostInit() { familiarAI = new HashMap(); } - @Override - public void notifyEquip(World world, ItemStack familiarStack, EntityPlayer player) { + public void notifyEquip(World world, EntityPlayer player) { if(!world.isRemote) { - FamiliarAIController controller = new FamiliarAIController(player); - controller.registerDefaultTasks(); - familiarAI.put(player, controller); + if(!familiarAI.containsKey(player)) { + FamiliarAIController controller = new FamiliarAIController(player); + controller.registerDefaultTasks(); + familiarAI.put(player, controller); + } + + if(!activeFamiliars.contains(player.getCommandSenderName())) activeFamiliars.add(player.getCommandSenderName()); + + PacketFamiliar.PacketFamiliarSyncSingle pkt; + List entityPlayers = MinecraftServer.getServer().getConfigurationManager().playerEntityList; + for(Object playerEntity : entityPlayers) { + if(!(playerEntity instanceof EntityPlayer)) continue; + + pkt = new PacketFamiliar.PacketFamiliarSyncSingle(true, player.getCommandSenderName()); + PacketHandler.INSTANCE.sendTo(pkt, (net.minecraft.entity.player.EntityPlayerMP) playerEntity); + } } } - @Override - public void notifyUnequip(World world, ItemStack familiarStack, EntityPlayer player) { - if(!world.isRemote) familiarAI.remove(player); + public void notifyUnequip(World world, EntityPlayer player) { + if(!world.isRemote) { + familiarAI.remove(player); + + activeFamiliars.remove(player.getCommandSenderName()); + + PacketFamiliar.PacketFamiliarSyncSingle pkt; + List entityPlayers = MinecraftServer.getServer().getConfigurationManager().playerEntityList; + for(Object playerEntity : entityPlayers) { + if(!(playerEntity instanceof EntityPlayer)) continue; + + pkt = new PacketFamiliar.PacketFamiliarSyncSingle(false, player.getCommandSenderName()); + PacketHandler.INSTANCE.sendTo(pkt, (net.minecraft.entity.player.EntityPlayerMP) playerEntity); + } + } } - @Override - public void equippedTick(World world, ItemStack familiarStack, EntityPlayer player) { + public void equippedTick(World world, EntityPlayer player) { if(!world.isRemote) { IInventory baublesInv = BaublesApi.getBaubles(player); if(baublesInv.getStackInSlot(0) == null) { - notifyUnequip(world, familiarStack, player); + notifyUnequip(world, player); return; } - if(familiarAI.get(player) == null) { - notifyEquip(world, familiarStack, player); + if(familiarAI.get(player) == null || !activeFamiliars.contains(player.getCommandSenderName())) { + notifyEquip(world, player); } + familiarAI.get(player).sheduleTick(); } } + public List getCurrentActiveFamiliars() { + return activeFamiliars; + } + + public void checkPlayerEquipment(EntityPlayer p) { + IInventory baublesInv = BaublesApi.getBaubles(p); + if(baublesInv.getStackInSlot(0) != null) { + notifyEquip(p.worldObj, p); + } + } } 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 0102351..1d01c16 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java @@ -34,21 +34,21 @@ public class ItemFamiliar extends Item implements IBauble { @Override public void onWornTick(ItemStack itemStack, EntityLivingBase entity) { if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { - Gadomancy.proxy.familiarHandler.equippedTick(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); + Gadomancy.proxy.familiarHandler.equippedTick(((EntityPlayer) entity).worldObj, (EntityPlayer) entity); } } @Override public void onEquipped(ItemStack itemStack, EntityLivingBase entity) { if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { - Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); + Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity); } } @Override public void onUnequipped(ItemStack itemStack, EntityLivingBase entity) { if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { - Gadomancy.proxy.familiarHandler.notifyUnequip(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); + Gadomancy.proxy.familiarHandler.notifyUnequip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity); } } diff --git a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java index ea36d3f..1eb194f 100644 --- a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java +++ b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java @@ -32,5 +32,7 @@ public class PacketHandler { INSTANCE.registerMessage(PacketTCWispyLine.class, PacketTCWispyLine.class, id++, Side.CLIENT); INSTANCE.registerMessage(PacketFamiliar.PacketFamiliarBolt.class, PacketFamiliar.PacketFamiliarBolt.class, id++, Side.CLIENT); + INSTANCE.registerMessage(PacketFamiliar.PacketFamiliarSyncCompletely.class, PacketFamiliar.PacketFamiliarSyncCompletely.class, id++, Side.CLIENT); + INSTANCE.registerMessage(PacketFamiliar.PacketFamiliarSyncSingle.class, PacketFamiliar.PacketFamiliarSyncSingle.class, id++, Side.CLIENT); } } 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 1e07a65..eaae402 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliar.java @@ -4,8 +4,10 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import makeo.gadomancy.client.renderers.item.familiar.FamiliarHandlerClient; -import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.client.util.FamiliarHandlerClient; + +import java.util.ArrayList; +import java.util.List; /** * This class is part of the Gadomancy Mod @@ -20,13 +22,15 @@ public abstract class PacketFamiliar { public static class PacketFamiliarBolt extends PacketFamiliar implements IMessage, IMessageHandler { public float targetX, targetY, targetZ; + public String owner; public PacketFamiliarBolt() {} - public PacketFamiliarBolt(float targetX, float targetY, float targetZ) { + public PacketFamiliarBolt(String whoseFamiliar, float targetX, float targetY, float targetZ) { this.targetX = targetX; this.targetY = targetY; this.targetZ = targetZ; + this.owner = whoseFamiliar; } @Override @@ -34,6 +38,11 @@ public abstract class PacketFamiliar { this.targetX = buf.readFloat(); this.targetY = buf.readFloat(); this.targetZ = buf.readFloat(); + + int length = buf.readInt(); + byte[] strBytes = new byte[length]; + buf.readBytes(strBytes, 0, length); + owner = new String(strBytes); } @Override @@ -41,11 +50,90 @@ public abstract class PacketFamiliar { buf.writeFloat(targetX); buf.writeFloat(targetY); buf.writeFloat(targetZ); + + byte[] str = owner.getBytes(); + buf.writeInt(str.length); + buf.writeBytes(str); } @Override - public IMessage onMessage(PacketFamiliarBolt packet, MessageContext ctx) { - ((FamiliarHandlerClient) Gadomancy.proxy.familiarHandler).processPacket(packet); + public IMessage onMessage(PacketFamiliarBolt message, MessageContext ctx) { + FamiliarHandlerClient.processPacket(message); + return null; + } + } + + public static class PacketFamiliarSyncCompletely extends PacketFamiliar implements IMessage, IMessageHandler { + + public List playerNamesWithFamiliars = new ArrayList(); + + public PacketFamiliarSyncCompletely() {} + + public PacketFamiliarSyncCompletely(List playerNamesWithFamiliars) { + this.playerNamesWithFamiliars = playerNamesWithFamiliars; + } + + @Override + public void fromBytes(ByteBuf buf) { + int cnt = buf.readInt(); + for (int i = 0; i < cnt; i++) { + int length = buf.readInt(); + byte[] strBytes = new byte[length]; + buf.readBytes(strBytes, 0, length); + playerNamesWithFamiliars.add(new String(strBytes)); + } + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(playerNamesWithFamiliars.size()); + for(String str : playerNamesWithFamiliars) { + byte[] strBytes = str.getBytes(); + buf.writeInt(strBytes.length); + buf.writeBytes(strBytes); + } + } + + @Override + public IMessage onMessage(PacketFamiliarSyncCompletely message, MessageContext ctx) { + FamiliarHandlerClient.processPacket(message); + return null; + } + } + + public static class PacketFamiliarSyncSingle extends PacketFamiliar implements IMessage, IMessageHandler { + + //True=add, False=remove + public boolean status; + public String name; + + public PacketFamiliarSyncSingle() {} + + public PacketFamiliarSyncSingle(boolean status, String name) { + this.status = status; + this.name = name; + } + + @Override + public void fromBytes(ByteBuf buf) { + status = buf.readBoolean(); + int length = buf.readInt(); + byte[] strBytes = new byte[length]; + buf.readBytes(strBytes, 0, length); + name = new String(strBytes); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(status); + byte[] str = name.getBytes(); + buf.writeInt(str.length); + buf.writeBytes(str); + } + + @Override + public IMessage onMessage(PacketFamiliarSyncSingle message, MessageContext ctx) { + FamiliarHandlerClient.processPacket(message); return null; } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java index 824b514..6c70984 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI.java @@ -6,10 +6,8 @@ import makeo.gadomancy.common.familiar.ai.FamiliarAIProcess; import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketFamiliar; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -65,7 +63,9 @@ public class RegisteredFamiliarAI { mob.attackEntityFrom(DamageSource.magic, 6); - PacketFamiliar.PacketFamiliarBolt bolt = new PacketFamiliar.PacketFamiliarBolt((float) mob.posX, (float) mob.posY, (float) mob.posZ); + world.playSoundEffect(mob.posX + 0.5, mob.posY + 0.5, mob.posZ + 0.5, "thaumcraft:zap", 0.8F, 1.0F); + + PacketFamiliar.PacketFamiliarBolt bolt = new PacketFamiliar.PacketFamiliarBolt(parent.getCommandSenderName(), (float) mob.posX, (float) mob.posY, (float) mob.posZ); PacketHandler.INSTANCE.sendToAllAround(bolt, new NetworkRegistry.TargetPoint(mob.worldObj.provider.dimensionId, mob.posX, mob.posY, mob.posZ, 32)); FamiliarAIController.cleanTargetterList(parent); }