From 05ab60db97ccceaa9382b1501b3c24e9eebbde5e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 7 May 2015 10:43:33 -0400 Subject: [PATCH] Add syncing to other clients for toggleable DS upgrades --- .../item/darksteel/DarkSteelController.java | 25 ++++++++++++++ .../item/darksteel/PacketUpgradeState.java | 33 +++++++++++++------ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index c67790db..614478ec 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -10,6 +10,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -17,6 +18,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.util.MovementInput; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import org.lwjgl.opengl.GL11; @@ -28,6 +30,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.PacketUpgradeState.Type; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; @@ -77,8 +80,21 @@ public class DarkSteelController { private DarkSteelController() { PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.CLIENT); } + public boolean isActive(EntityPlayer player, Type type) { + switch(type) { + case GLIDE: + return isGlideActive(player); + case SPEED: + return isSpeedActive(player); + case STEP_ASSIST: + return isStepAssistActive(player); + } + return false; + } + public void setGlideActive(EntityPlayer player, boolean isGlideActive) { if(player.getGameProfile().getId() != null) { glideActiveMap.put(player.getGameProfile().getId(), isGlideActive); @@ -360,6 +376,15 @@ public class DarkSteelController { } return res; } + + @SubscribeEvent + public void onStartTracking(PlayerEvent.StartTracking event) { + if (event.target instanceof EntityPlayerMP) { + for (PacketUpgradeState.Type type : PacketUpgradeState.Type.values()) { + PacketHandler.sendTo(new PacketUpgradeState(type, isActive((EntityPlayer) event.target, type), event.target.getEntityId()), (EntityPlayerMP) event.entityPlayer); + } + } + } @SideOnly(Side.CLIENT) @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java index 7498c84f..bfd94043 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java @@ -1,10 +1,12 @@ package crazypants.enderio.item.darksteel; -import net.minecraft.entity.player.EntityPlayerMP; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; 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 crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; public class PacketUpgradeState implements IMessage, IMessageHandler { @@ -19,28 +21,36 @@ public class PacketUpgradeState implements IMessage, IMessageHandler