remove hacky circuit oredict code (#955)

2 files changed, 27 insertions, 42 deletions

diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index b6e494dc5c..7c2dacd850 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -463,22 +463,9 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
             }
         }
 
-        for (int i = 0; i < aInputs.length; ++i) {
-            if (!GT_Utility.isStackValid(aInputs[i])) {
+        for (ItemStack aInput : aInputs) {
+            if (!GT_Utility.isStackValid(aInput)) {
                 GT_FML_LOGGER.debug("GT_RecipeAdder: Invalid input for (" + aOutput1.toString() + ")");
-                continue;
-            }
-            for (int oreID : OreDictionary.getOreIDs(aInputs[i])) {
-                String odName = OreDictionary.getOreName(oreID);
-                if (odName.startsWith("circuit")) {
-                    for (ItemStack tStack : GT_OreDictUnificator.getOresImmutable(odName)) {
-                        if (!GT_Utility.isStackValid(tStack))
-                            continue;
-                        aInputs[i] = new ItemStack(tStack.getItem(), aInputs[i].stackSize, tStack.getItemDamage());
-                        GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput1}, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0);
-                        ret = true;
-                    }
-                }
             }
         }
 
@@ -1434,7 +1421,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
         }
         if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) {
             return false;
-        } 
+        }
         ItemStack[] tInputs = new ItemStack[aInputs.length];
         ItemStack[][] tAlts = new ItemStack[aInputs.length][];
         int tPersistentHash = 1;
@@ -1469,7 +1456,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
         				int tAmount = ((Number) objs[1]).intValue();
             			List<ItemStack> uList = new ArrayList<>();
             			for (ItemStack tStack : tList) {
-            				ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack); 
+            				ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack);
             				if (GT_Utility.isStackValid(uStack)) {
             					uList.add(uStack);
             					if (tInputs[i] == null)
@@ -1528,37 +1515,16 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
             return false;
         }
 
-        boolean ret = false;
-
         for (int oreID : OreDictionary.getOreIDs(aOutput)) {
             if (OreDictionary.getOreName(oreID).startsWith("circuit")){
                 return this.addCircuitAssemblerRecipeNonOredicted(aInputs, aFluidInput, aOutput, aDuration, aEUt, aCleanroom);
             }
         }
 
-        for (int i = 0; i < aInputs.length; ++i) {
-            for (int oreID : OreDictionary.getOreIDs(aInputs[i])) {
-                String odName = OreDictionary.getOreName(oreID);
-                if (odName.startsWith("circuit")) {
-                    for (ItemStack tStack : GT_OreDictUnificator.getOresImmutable(odName)) {
-                        if (!GT_Utility.isStackValid(tStack))
-                            continue;
-                        aInputs[i] = new ItemStack(tStack.getItem(),aInputs[i].stackSize,tStack.getItemDamage());
-                        GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0);
-                        ret = true;
-                    }
-                }
-            }
-        }
-
-        if (!ret) {
-            GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0);
-            ret = true;
-        }
-
-        return ret;
+        GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0);
+        return true;
     }
-    
+
     public boolean addCircuitAssemblerRecipeNonOredicted(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt, boolean aCleanroom) {
         if ((aInputs == null) || (aOutput == null) || aInputs.length>6 || aInputs.length<1) {
             return false;
@@ -1572,6 +1538,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
         GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0);
         return true;
     }
+
     private boolean areItemsAndFluidsBothNull(ItemStack[] items, FluidStack[] fluids){
         boolean itemsNull = true;
         if (items != null) {
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
index c9a7b53c03..70b431c7fb 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
@@ -225,5 +225,23 @@ public class GT_Loader_OreDictionary implements Runnable {
         GT_OreDictUnificator.registerOre(OrePrefixes.itemCasing, Materials.Iridium, GT_ModHandler.getModItem(MOD_ID_DC,"item.IridiumItemCasing", 1L, 0));
         GT_OreDictUnificator.registerOre(OrePrefixes.itemCasing, Materials.Titanium, GT_ModHandler.getModItem(MOD_ID_DC,"item.TitaniumItemCasing", 1L, 0));
         GT_OreDictUnificator.registerOre(OrePrefixes.itemCasing, Materials.Chrome, GT_ModHandler.getModItem(MOD_ID_DC,"item.ChromeItemCasing", 1L, 0));
-       }
+
+        //Fake Circuits
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Primitive, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitULV", 1L));
+        //GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitLV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Good, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMV", 1L));
+        //GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitHV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Data, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitEV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Elite, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitIV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Master, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitLuV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Ultimate, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitZPM", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Superconductor, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Infinite, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUHV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Bio, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUEV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Optical, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUIV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Exotic, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUMV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Cosmic, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUXV", 1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Transcendent, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMAX", 1L));
+
+    }
 }