From 976f719b469bd194f74c2f5213dccf9e59ce6b74 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 26 Nov 2014 21:03:00 +0800 Subject: [PATCH] #1011 Shift-clicking armor from a Capacitor Bank's charge slots will re-equip the item if possible --- ReleaseNotes.txt | 2 +- .../machine/power/ContainerCapacitorBank.java | 25 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 890a2751..55e7b498 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -17,7 +17,7 @@ Changes - Added support for a large number of new IMC messages. Details in crazypants.enderio.api.IMC - #1098 Added Soulbound enchantment. Items with this enchantment will not be dropped when the player dies - #1272 Number of items required for each enchantment level in the Enchanter can now be set in the config - +- #1011 Shift-clicking armor from a Capacitor Bank's charge slots will re-equip the item if possible Bugs - Fix outer corners on connected texture blocks not being metadata sensitive when they should be diff --git a/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java index b09147f8..ed809c42 100644 --- a/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java @@ -50,12 +50,12 @@ public class ContainerCapacitorBank extends Container { // add players inventory for (int i = 0; i < 3; ++i) { for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, + armorOffset + 8 + j * 18, 84 + i * 18)); + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, +armorOffset + 8 + j * 18, 84 + i * 18)); } } for (int i = 0; i < 9; ++i) { - addSlotToContainer(new Slot(playerInv, i, + armorOffset + 8 + i * 18, 142)); + addSlotToContainer(new Slot(playerInv, i, +armorOffset + 8 + i * 18, 142)); } //armor slots @@ -108,8 +108,10 @@ public class ContainerCapacitorBank extends Container { if(slotIndex < 4) { // merge from machine input slots to inventory - if(!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { - return null; + if(!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex)) { + if(!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { + return null; + } } } else { @@ -149,4 +151,19 @@ public class ContainerCapacitorBank extends Container { return copystack; } + private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { + if(origStack == null || !(origStack.getItem() instanceof ItemArmor)) { + return false; + } + ItemArmor armor = (ItemArmor) origStack.getItem(); + int index = 3 - armor.armorType; + ItemStack[] ai = entityPlayer.inventory.armorInventory; + if(ai[index] == null) { + ai[index] = origStack.copy(); + origStack.stackSize = 0; + return true; + } + return false; + } + }