diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 555061c3..e21bd0d8 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -47,7 +47,7 @@ public class ItemYetaWrench extends Item implements IToolWrench { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { Block block = world.getBlock(x, y, z); - if(block != null && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { + if(block != null && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side)) && !player.isSneaking()) { player.swingItem(); return !world.isRemote; } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 86243b10..73fe8dd4 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -19,9 +19,13 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im @Override public int[] getAccessibleSlotsFromSide(int var1) { - int[] res = new int[inventory.length]; - for (int i = 0; i < res.length; i++) { - res[i] = i; + int[] res = new int[inventory.length - slotDefinition.getNumUpgradeSlots()]; + int index = 0; + for (int i = 0; i < inventory.length; i++) { + if(!slotDefinition.isUpgradeSlot(i)) { + res[index] = i; + index++; + } } return res; } diff --git a/src/main/java/crazypants/enderio/machine/SlotDefinition.java b/src/main/java/crazypants/enderio/machine/SlotDefinition.java index 6c548e88..53839159 100644 --- a/src/main/java/crazypants/enderio/machine/SlotDefinition.java +++ b/src/main/java/crazypants/enderio/machine/SlotDefinition.java @@ -41,6 +41,10 @@ public class SlotDefinition { return slot >= minOutputSlot && slot <= maxOutputSlot; } + public int getNumUpgradeSlots() { + return Math.max(0, maxUpgradeSlot - minUpgradeSlot + 1); + } + public int getNumInputSlots() { return Math.max(0, maxInputSlot - minInputSlot + 1); }