diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java index 532f3efcfb..74802beb84 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java +++ b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java @@ -9,6 +9,7 @@ import java.util.Map.Entry; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.array.Pair; +import gtPlusPlus.core.util.nbt.ModularArmourUtils; import gtPlusPlus.core.util.nbt.ModularArmourUtils.BT; import gtPlusPlus.core.util.nbt.ModularArmourUtils.Modifiers; import net.minecraft.inventory.IInventory; @@ -25,43 +26,27 @@ public class SlotModularBaubleUpgrades extends Slot{ @Override public boolean isItemValid(final ItemStack itemstack) { boolean isValid = false; - if (itemstack != null){ Utils.LOG_INFO("trying to insert "+itemstack.getDisplayName()); Utils.LOG_INFO("Valid Upgrade count: "+mValidUpgradeList.size()); - if (mValidUpgradeList.containsKey(itemstack)){ - isValid = true; - } - else { - Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it = mValidUpgradeList.entrySet().iterator(); - while (it.hasNext()) { - Entry<ItemStack, Pair<Modifiers, Integer>> pair = it.next(); - - if (pair.getKey().getItem() == itemstack.getItem() - && pair.getKey().getItemDamage() == itemstack.getItemDamage()){ - isValid = true; - } - - //Utils.LOG_INFO("Found "+pair.getKey().getDisplayName()+" giving "+pair.getValue().getKey().name()+"."); + + Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator(); + while (it.hasNext()) { + Entry<ItemStack, BT> pair = it.next(); + if (pair.getKey().getItem() == itemstack.getItem() + && pair.getKey().getItemDamage() == itemstack.getItemDamage()){ + isValid = true; } } - Utils.LOG_INFO("Valid Form Upgrade count: "+mValidUpgradeListFormChange.size()); - if (mValidUpgradeListFormChange.containsKey(itemstack)){ - isValid = true; - } - else { - Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator(); - while (it.hasNext()) { - Entry<ItemStack, BT> pair = it.next(); - - if (pair.getKey().getItem() == itemstack.getItem() - && pair.getKey().getItemDamage() == itemstack.getItemDamage()){ - isValid = true; - } - - //Utils.LOG_INFO("Found "+pair.getKey().getDisplayName()+" giving "+pair.getValue().name()+"."); + + Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 = mValidUpgradeList.entrySet().iterator(); + while (it2.hasNext()) { + Entry<ItemStack, Pair<Modifiers, Integer>> pair = it2.next(); + if (pair.getKey().getItem() == itemstack.getItem() + && pair.getKey().getItemDamage() == itemstack.getItemDamage()){ + isValid = true; } - } + } } return isValid; } |