+ More modular work.

1 files changed, 73 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
new file mode 100644
index 0000000000..532f3efcfb
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
@@ -0,0 +1,73 @@
+package gtPlusPlus.core.slots;
+
+import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeList;
+import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.mValidUpgradeListFormChange;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.core.util.nbt.ModularArmourUtils.BT;
+import gtPlusPlus.core.util.nbt.ModularArmourUtils.Modifiers;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class SlotModularBaubleUpgrades extends Slot{
+
+	public SlotModularBaubleUpgrades(final IInventory inventory, final int slot, final int x, final int y) {
+		super(inventory, slot, x, y);
+
+	}
+
+	@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()+".");
+				}
+			}
+			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()+".");
+				}
+			}
+		}
+		return isValid;
+	}
+
+	@Override
+	public int getSlotStackLimit() {
+		return 1;
+	}
+}