+ Added a config option to disable Zombie Reinforcements.

% Redid some Circuit handling for recipes.
$ Fixed Component Assembler recipes not using all circuits per tier for recipes.

2 files changed, 61 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 852dde6a4b..71b37ebf48 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -684,6 +684,22 @@ public class ItemUtils {
 		Utils.LOG_INFO("[Component Maker] Found "+mItemName+".");
 		return (gregstack);
 	}
+	
+	public static ItemStack[] getStackOfAllOreDictGroup(String oredictname){
+		final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictname);
+		if (!oreDictList.isEmpty()){
+			final ItemStack[] returnValues = new ItemStack[oreDictList.size()];			
+			for (int i=0;i<oreDictList.size();i++){
+				if (oreDictList.get(i) != null){
+					returnValues[i] = oreDictList.get(i);					
+				}
+			}			
+			return returnValues.length>0 ? returnValues : null;
+		}
+		else {
+			return null;
+		}
+	}
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index 8a138366ba..7d094b7a43 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -322,6 +322,51 @@ public class RecipeUtils {
 
 
 
+	public static boolean addShapedGregtechRecipeForTypes(
+			final Object InputItem1, final Object InputItem2, final Object InputItem3,
+			final Object InputItem4, final Object InputItem5, final Object InputItem6,
+			final Object InputItem7, final Object InputItem8, final Object InputItem9,
+			final ItemStack OutputItem){
+
+		int using = 0, recipeSlotCurrent = 0;
+		boolean[] hasMultiStack = new boolean[9];
+		boolean inUse[] = {false, false, false};		
+		ItemStack array[][] = new ItemStack[3][9];
+		
+		Object[] inputs = {
+				InputItem1, InputItem2, InputItem3,
+				InputItem4, InputItem5, InputItem6, 
+				InputItem7, InputItem8, InputItem9};
+		
+		for (Object o : inputs){
+			if (o.getClass().isArray()){
+				if (inUse[using] == false){
+					inUse[using] = true;
+					array[using] = (ItemStack[]) o;
+					hasMultiStack[recipeSlotCurrent] = true;
+					using++;					
+				}
+			}
+			else {
+				hasMultiStack[recipeSlotCurrent] = false;
+			}
+			recipeSlotCurrent++;
+		}
+		
+		int using2 = 0;
+		for (boolean t : inUse){
+			
+			if (t){
+				if (array[using2] != null){
+					//addShapedGregtechRecipe
+				}
+			}
+			using2++;
+		}
+		
+		
+		return false;
+	}