From af4c7ce5870a116ee85791bb321664eccb2f4dbd Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 20 Mar 2015 16:45:51 -0400 Subject: [PATCH] #2128 Fix server crash without use of SideOnly. Obsoletes #2130 --- .../crazypants/enderio/item/KeyTracker.java | 28 ++++++++++++++- .../enderio/item/MagnetController.java | 36 ++----------------- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 27ca8ed3..4ec2effe 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -4,11 +4,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; import org.lwjgl.input.Keyboard; +import static crazypants.enderio.EnderIO.itemMagnet; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -16,6 +19,7 @@ import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; +import crazypants.enderio.item.PacketMagnetState.SlotType; import crazypants.enderio.item.darksteel.DarkSteelController; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.item.darksteel.JumpUpgrade; @@ -25,6 +29,7 @@ import crazypants.enderio.item.darksteel.SoundDetectorUpgrade; import crazypants.enderio.item.darksteel.SpeedUpgrade; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; +import crazypants.enderio.tool.BaublesTool; import crazypants.util.Lang; public class KeyTracker { @@ -94,7 +99,28 @@ public class KeyTracker { private void handleMagnet() { if(magnetKey.getIsKeyPressed()) { - MagnetController.handleKeypress(); + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + ItemStack[] inv = player.inventory.mainInventory; + for (int i = 0; i < 9; i++) { + if(inv[i] != null && inv[i].getItem() != null && inv[i].getItem() == itemMagnet) { + boolean isActive = !ItemMagnet.isActive(inv[i]); + ItemMagnet.setActive(inv[i], isActive); + PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.INVENTORY, i, isActive)); + return; + } + } + + IInventory baubles = BaublesTool.getInstance().getBaubles(player); + if(baubles != null) { + for (int i = 0; i < baubles.getSizeInventory(); i++) { + ItemStack stack = baubles.getStackInSlot(i); + if(stack != null && stack.getItem() != null && stack.getItem() == itemMagnet) { + ItemMagnet.setActive(stack, false); + PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, false)); + return; + } + } + } } } diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index 5b553782..3a1c1218 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -1,11 +1,7 @@ package crazypants.enderio.item; -import static crazypants.enderio.EnderIO.itemMagnet; - import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -13,7 +9,6 @@ import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -21,11 +16,11 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.config.Config; import crazypants.enderio.item.PacketMagnetState.SlotType; -import crazypants.enderio.item.darksteel.PacketDarkSteelPowerPacket; -import crazypants.enderio.item.darksteel.PacketUpgradeState; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.BaublesTool; +import static crazypants.enderio.EnderIO.itemMagnet; + public class MagnetController implements IEntitySelector { public MagnetController() { @@ -151,31 +146,4 @@ public class MagnetController implements IEntitySelector { break; } } - - public static void handleKeypress() { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - ItemStack[] inv = player.inventory.mainInventory; - for (int i = 0; i < 9; i++) { - if (inv[i] != null && inv[i].getItem() != null && inv[i].getItem() == itemMagnet) { - boolean isActive = !ItemMagnet.isActive(inv[i]); - ItemMagnet.setActive(inv[i], isActive); - PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.INVENTORY, i, isActive)); - return; - } - } - - IInventory baubles = BaublesTool.getInstance().getBaubles(player); - if (baubles != null) { - for (int i = 0; i < baubles.getSizeInventory(); i++) { - ItemStack stack = baubles.getStackInSlot(i); - if (stack != null && stack.getItem() != null && stack.getItem() == itemMagnet) { - ItemMagnet.setActive(stack, false); - PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, false)); - return; - } - } - } - - } - }