From bbff9ff60f188c548373ba8e705126dd647c6664 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 3 Mar 2014 18:13:29 +0800 Subject: [PATCH 1/2] #520 Alloy Smelter upgrade breaks ME interface 'blocking mode' --- .../enderio/machine/AbstractPoweredTaskEntity.java | 10 +++++++--- common/crazypants/enderio/machine/SlotDefinition.java | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 4aea811e..03dd375d 100644 --- a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/common/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/common/crazypants/enderio/machine/SlotDefinition.java b/common/crazypants/enderio/machine/SlotDefinition.java index 6c548e88..53839159 100644 --- a/common/crazypants/enderio/machine/SlotDefinition.java +++ b/common/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); } From 2b6018bf289901c3e3354594d463399d3d82d7c6 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 3 Mar 2014 18:18:54 +0800 Subject: [PATCH 2/2] #519 Can't shift-wrench to pick up certain TE blocks --- common/crazypants/enderio/item/ItemYetaWrench.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/crazypants/enderio/item/ItemYetaWrench.java b/common/crazypants/enderio/item/ItemYetaWrench.java index 5f39638b..219d74b0 100644 --- a/common/crazypants/enderio/item/ItemYetaWrench.java +++ b/common/crazypants/enderio/item/ItemYetaWrench.java @@ -49,7 +49,7 @@ public class ItemYetaWrench extends Item implements IToolWrench { public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { int blockId = world.getBlockId(x, y, z); Block block = Block.blocksList[blockId]; - 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; }