From ffc97bf3ed976b8d665127673919c5d2d9b54bae Mon Sep 17 00:00:00 2001 From: cp Date: Tue, 4 Mar 2014 15:05:22 +0800 Subject: [PATCH] More bug fixes. --- .../enderio/conduit/BlockConduitBundle.java | 2 +- .../enderio/conduit/ConduitDisplayMode.java | 3 +- .../item/YetaWrenchOverlayRenderer.java | 2 - .../item/YetaWrenchPacketProcessor.java | 2 +- .../enderio/item/YetaWrenchTickHandler.java | 63 ++++++++++++------- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 54fbaa98..423f2091 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -425,7 +425,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { return false; } - if(PainterUtil.getSourceBlock(player.getCurrentEquippedItem()) != null) { + if(PainterUtil.getSourceBlock(player.getCurrentEquippedItem()) == null) { return false; } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index 664a90ff..8e428154 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -8,8 +8,7 @@ public enum ConduitDisplayMode { POWER, REDSTONE, ITEM, - FLUID, - ME; + FLUID; public static ConduitDisplayMode next(ConduitDisplayMode mode) { int index = mode.ordinal() + 1; diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index bfc85211..611181a6 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -63,8 +63,6 @@ public class YetaWrenchOverlayRenderer { IconEIO.WRENCH_OVERLAY_ITEM.renderIcon(offsetX + 32, offsetY - 32, 16, 16, 0, true); } else if(mode == ConduitDisplayMode.REDSTONE) { IconEIO.WRENCH_OVERLAY_REDSTONE.renderIcon(offsetX + 16, offsetY - 32, 16, 16, 0, true); - } else if(mode == ConduitDisplayMode.ME) { - IconEIO.WRENCH_OVERLAY_ME.renderIcon(offsetX + 24, offsetY - 16, 16, 16, 0, true); } } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java b/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java index 297cf090..2f12f602 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java @@ -28,7 +28,7 @@ public class YetaWrenchPacketProcessor implements IPacketEio { @Override public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { - slot = buffer.readShort(); + slot = buffer.readInt(); mode = ConduitDisplayMode.values()[buffer.readShort()]; } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java b/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java index abc4cd83..da56878a 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchTickHandler.java @@ -8,6 +8,7 @@ import org.lwjgl.input.Mouse; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -20,33 +21,47 @@ public class YetaWrenchTickHandler { @SideOnly(Side.CLIENT) @SubscribeEvent public void onClientTick(TickEvent.ClientTickEvent event) { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - if(player != null) { - if(slotSelected > -1 && dWheel != Mouse.getDWheel()) { - player.inventory.currentItem = slotSelected; - Minecraft.getMinecraft().playerController.updateController(); - ItemStack stack = player.inventory.getStackInSlot(slotSelected); - ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack); - if(curMode == null) { - curMode = ConduitDisplayMode.ALL; - } - - int dif = dWheel - Mouse.getDWheel(); - ConduitDisplayMode newMode = null; - if(dif < 0) { - newMode = curMode.next(); - ConduitDisplayMode.setDisplayMode(stack, newMode); - } else if(dif > 0) { - newMode = curMode.previous(); - ConduitDisplayMode.setDisplayMode(stack, newMode); - } - if(newMode != null) { - EnderIO.packetPipeline.sendToServer(new YetaWrenchPacketProcessor(slotSelected, newMode)); - } + if(event.phase == Phase.START) { + dWheel = Mouse.getDWheel() / 120; + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if(player != null && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemYetaWrench + && player.isSneaking()) { + slotSelected = player.inventory.currentItem; + } else { + slotSelected = -1; } - slotSelected = -1; + } else { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if(player != null) { + if(slotSelected > -1 && dWheel != Mouse.getDWheel()) { + + player.inventory.currentItem = slotSelected; + Minecraft.getMinecraft().playerController.updateController(); + + ItemStack stack = player.inventory.getStackInSlot(slotSelected); + ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack); + if(curMode == null) { + curMode = ConduitDisplayMode.ALL; + } + + int dif = dWheel - Mouse.getDWheel(); + ConduitDisplayMode newMode = null; + if(dif < 0) { + newMode = curMode.next(); + ConduitDisplayMode.setDisplayMode(stack, newMode); + } else if(dif > 0) { + newMode = curMode.previous(); + ConduitDisplayMode.setDisplayMode(stack, newMode); + } + if(newMode != null) { + EnderIO.packetPipeline.sendToServer(new YetaWrenchPacketProcessor(slotSelected, newMode)); + } + } + slotSelected = -1; + + } } }