+ Added support for Bio Circuits to Circuit Slots and the Circuit Programmer.

5 files changed, 70 insertions, 19 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java b/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
index 0769d0a473..4dc032d01f 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 public class NoOutputBonusMultiBehaviour extends SpecialMultiBehaviour {
 
 	public NoOutputBonusMultiBehaviour() {
-		
+		// Used by other mods which may wish to not obtain bonus outputs on their Sifting or Maceration recipes.
 	}
 	
 	@Override
diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java b/src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java
index 4cdbb72c6e..da45b5a988 100644
--- a/src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java
+++ b/src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.inventories;
 
-import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -167,7 +167,7 @@ public class InventoryCircuitProgrammer implements IInventory{
 	 */
 	@Override
 	public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
-		return (itemstack.getItem() == CI.getNumberedCircuit(0).getItem());
+		return SlotIntegratedCircuit.isItemValidForSlot(itemstack);
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
index c41a385c4b..48b050d678 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
@@ -10,12 +10,13 @@ import gtPlusPlus.core.recipe.common.CI;
 public class SlotIntegratedCircuit extends Slot {
 
 	public static Item mCircuitItem;
+	public static Item mCircuitItem2;
 	private final short mCircuitLock;
 
 	public SlotIntegratedCircuit(final IInventory inventory, final int slot, final int x, final int y) {
 		this(Short.MAX_VALUE+1, inventory, slot, x, y);
 	}
-	
+
 	public SlotIntegratedCircuit(int mTypeLock, final IInventory inventory, final int slot, final int x, final int y) {
 		super(inventory, slot, x, y);
 		if (mTypeLock > Short.MAX_VALUE || mTypeLock < Short.MIN_VALUE) {
@@ -28,18 +29,29 @@ public class SlotIntegratedCircuit extends Slot {
 
 	@Override
 	public synchronized boolean isItemValid(final ItemStack itemstack) {
+		return isItemValidForSlot(mCircuitLock, itemstack);
+	}
+
+	public static synchronized boolean isItemValidForSlot(final ItemStack itemstack) {
+		return isItemValidForSlot(-1, itemstack);
+	}
+
+	public static synchronized boolean isItemValidForSlot(int aLockedCircuitNumber, final ItemStack itemstack) {
 		boolean isValid = false;
 		if (mCircuitItem == null) {
 			mCircuitItem = CI.getNumberedCircuit(0).getItem();
 		}
-		if (mCircuitItem != null) {
+		if (mCircuitItem2 == null) {
+			mCircuitItem2 = CI.getNumberedBioCircuit(0).getItem();
+		}
+		if (mCircuitItem != null && mCircuitItem2 != null) {
 			if (itemstack != null) {
-				if (itemstack.getItem() == mCircuitItem) {					
-					if (mCircuitLock == -1) {
+				if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) {					
+					if (aLockedCircuitNumber == -1) {
 						isValid = true;
 					}
 					else {
-						if (itemstack.getItemDamage() == mCircuitLock) {
+						if (itemstack.getItemDamage() == aLockedCircuitNumber) {
 							isValid = true;
 						}
 					}					
@@ -49,6 +61,33 @@ public class SlotIntegratedCircuit extends Slot {
 		return isValid;
 	}
 
+	/**
+	 * Returns the circuit type. -1 is invalid, 0 is standard, 1 is GT++ bio.
+	 * @param itemstack - the Circuit Stack.
+	 * @return
+	 */
+	public static synchronized int isRegularProgrammableCircuit(final ItemStack itemstack) {
+		if (mCircuitItem == null) {
+			mCircuitItem = CI.getNumberedCircuit(0).getItem();
+		}
+		if (mCircuitItem2 == null) {
+			mCircuitItem2 = CI.getNumberedBioCircuit(0).getItem();
+		}
+		if (mCircuitItem != null && mCircuitItem2 != null) {
+			if (itemstack != null) {
+				if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) {
+					if (itemstack.getItem() == mCircuitItem) {
+						return 0;
+					}
+					else if (itemstack.getItem() == mCircuitItem2) {
+						return 1;
+					}				
+				}
+			}
+		}
+		return -1;
+	}
+
 	@Override
 	public int getSlotStackLimit() {
 		return 64;
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
index 0157384cd0..23ad2a3233 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
@@ -11,6 +11,7 @@ import net.minecraft.tileentity.TileEntity;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
 import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
 public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInventory {
@@ -76,16 +77,21 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv
 			boolean doAdd = false;
 			ItemStack g = this.getStackInSlot(e);
 			int aSize = 0;
-			ItemStack aInputStack = null;			
-			if (g != null) {				
+			ItemStack aInputStack = null;	
+			int aTypeInSlot = SlotIntegratedCircuit.isRegularProgrammableCircuit(g);
+			if (aTypeInSlot >= 0 && g != null) {
+				// No Existing Output
 				if (!hasOutput) {
 					aSize = g.stackSize;
 					doAdd = true;
 				}
+				// Existing Output
 				else {
 					ItemStack f = this.getStackInSlot(25);
-					if (f != null) {
-						if (f.getItemDamage() == e) {
+					int aTypeInCheckedSlot = SlotIntegratedCircuit.isRegularProgrammableCircuit(f);					
+					// Check that the Circuit in the Output slot is not null and the same type as the circuit input.
+					if (aTypeInCheckedSlot >= 0 && (aTypeInSlot == aTypeInCheckedSlot) && f != null) {
+						if (g.getItem() == f.getItem() && f.getItemDamage() == e) {
 							aSize = f.stackSize + g.stackSize;							
 							if (aSize > 64) {
 								aInputStack = g.copy();
@@ -93,14 +99,21 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv
 							}
 							doAdd = true;							
 						}
-					}
-					else {
-						doAdd = true;
-						aSize = g.stackSize;
 					}					
 				}				
-				if (doAdd) {				
-					ItemStack aOutput = CI.getNumberedCircuit(e);
+				if (doAdd) {	
+					// Check Circuit Type					
+					ItemStack aOutput;
+					if (aTypeInSlot == 0) {
+						aOutput = CI.getNumberedCircuit(e);
+					}
+					else if (aTypeInSlot == 1) {
+						aOutput = CI.getNumberedBioCircuit(e);
+					}
+					else {
+						aOutput = null;
+					}			
+					
 					if (aOutput != null) {
 						aOutput.stackSize = aSize;
 						this.setInventorySlotContents(e, aInputStack);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 55378113d9..fe9e3ee9a0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -49,7 +49,6 @@ import gtPlusPlus.api.objects.data.ConcurrentSet;
 import gtPlusPlus.api.objects.data.FlexiblePair;
 import gtPlusPlus.api.objects.data.Triplet;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.api.objects.minecraft.multi.NoOutputBonusMultiBehaviour;
 import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;