No more id shift (#128)

Former-commit-id: 549b9eb4de861d1377acd470a079bf44ad431d06

1 files changed, 84 insertions, 21 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
index a82dfb452d..c0613200df 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
@@ -29,11 +29,12 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Utility;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import static gregtech.api.enums.ItemList.*;
 
@@ -72,29 +73,91 @@ public class CircuitPartLoader implements Runnable {
 
             ){
                 CircuitImprintLoader.blacklistSet.add(single.get(1));
-                continue;
             }
+        }
+
+        for (ItemList single : CIRCUIT_PARTS) {
+            if (!single.hasBeenSet())
+                continue;
             ItemStack itemStack = single.get(1);
             if (!GT_Utility.isStackValid(itemStack))
                 continue;
-            int[] oreIDS = OreDictionary.getOreIDs(itemStack);
-            if (oreIDS.length > 1)
-                continue;
-            String name = null;
-            if (oreIDS.length == 1)
-                name = OreDictionary.getOreName(oreIDS[0]);
-            if ((name == null || name.isEmpty()) && (single.toString().contains("Circuit") || single.toString().contains("circuit") || single.toString().contains("board")) && single.getBlock() == Blocks.air) {
-                ArrayList<String> toolTip = new ArrayList<>();
-                if (FMLCommonHandler.instance().getEffectiveSide().isClient())
-                    single.getItem().addInformation(single.get(1).copy(), null, toolTip, true);
-                String tt = (toolTip.size() > 0 ? toolTip.get(0) : "");
-                //  tt += "Internal Name = "+single;
-                String localised = GT_LanguageManager.getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack));
-                BW_Meta_Items.getNEWCIRCUITS().addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised+"s", tt);
-                GT_Values.RA.addAssemblerRecipe(new ItemStack[]{single.get(16).copy(), GT_Utility.getIntegratedCircuit(16)}, Materials.Plastic.getMolten(72),BW_Meta_Items.getNEWCIRCUITS().getStack(CircuitImprintLoader.reverseIDs),600,30);
-                CircuitImprintLoader.circuitIIconRefs.put(CircuitImprintLoader.reverseIDs,single);
-                CircuitImprintLoader.reverseIDs--;
-            }
+            ArrayList<String> toolTip = new ArrayList<>();
+            if (FMLCommonHandler.instance().getEffectiveSide().isClient())
+                single.getItem().addInformation(single.get(1).copy(), null, toolTip, true);
+            String tt = (toolTip.size() > 0 ? toolTip.get(0) : "");
+            //  tt += "Internal Name = "+single;
+            String localised = GT_LanguageManager.getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack));
+            BW_Meta_Items.getNEWCIRCUITS().addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised+"s", tt);
+            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{single.get(16).copy(), GT_Utility.getIntegratedCircuit(16)}, Materials.Plastic.getMolten(72),BW_Meta_Items.getNEWCIRCUITS().getStack(CircuitImprintLoader.reverseIDs),600,30);
+            CircuitImprintLoader.circuitIIconRefs.put(CircuitImprintLoader.reverseIDs,single);
+            CircuitImprintLoader.reverseIDs--;
         }
     }
+
+    /**
+     * Contains all the circuit parts we want to generate wrapped version of.
+     * New entries MUST be placed at the END of this list, to prevent id shift.
+     */
+    private static final List<ItemList> CIRCUIT_PARTS = Collections.unmodifiableList(Arrays.asList(
+        Circuit_Board_Basic,
+        Circuit_Board_Advanced,
+        Circuit_Board_Elite,
+        Circuit_Parts_Crystal_Chip_Elite,
+        Circuit_Parts_Crystal_Chip_Master,
+        Circuit_Board_Coated,
+        Circuit_Board_Coated_Basic,
+        Circuit_Board_Phenolic,
+        Circuit_Board_Phenolic_Good,
+        Circuit_Board_Epoxy,
+        Circuit_Board_Epoxy_Advanced,
+        Circuit_Board_Fiberglass,
+        Circuit_Board_Fiberglass_Advanced,
+        Circuit_Board_Multifiberglass_Elite,
+        Circuit_Board_Multifiberglass,
+        Circuit_Board_Wetware,
+        Circuit_Board_Wetware_Extreme,
+        Circuit_Board_Plastic,
+        Circuit_Board_Plastic_Advanced,
+        Circuit_Board_Bio,
+        Circuit_Board_Bio_Ultra,
+        Circuit_Parts_ResistorSMD,
+        Circuit_Parts_Coil,
+        Circuit_Parts_DiodeSMD,
+        Circuit_Parts_TransistorSMD,
+        Circuit_Parts_CapacitorSMD,
+        Circuit_Parts_ResistorASMD,
+        Circuit_Parts_DiodeASMD,
+        Circuit_Parts_TransistorASMD,
+        Circuit_Parts_CapacitorASMD,
+        Circuit_Chip_ILC,
+        Circuit_Chip_Ram,
+        Circuit_Chip_NAND,
+        Circuit_Chip_NOR,
+        Circuit_Chip_CPU,
+        Circuit_Chip_SoC,
+        Circuit_Chip_SoC2,
+        Circuit_Chip_PIC,
+        Circuit_Chip_Simple_SoC,
+        Circuit_Chip_HPIC,
+        Circuit_Chip_UHPIC,
+        Circuit_Chip_ULPIC,
+        Circuit_Chip_LPIC,
+        Circuit_Chip_NPIC,
+        Circuit_Chip_PPIC,
+        Circuit_Chip_QPIC,
+        Circuit_Chip_NanoCPU,
+        Circuit_Chip_QuantumCPU,
+        Circuit_Chip_CrystalCPU,
+        Circuit_Chip_CrystalSoC,
+        Circuit_Chip_CrystalSoC2,
+        Circuit_Chip_NeuroCPU,
+        Circuit_Chip_BioCPU,
+        Circuit_Chip_Stemcell,
+        Circuit_Chip_Biocell,
+        Circuit_Parts_ResistorXSMD,
+        Circuit_Parts_DiodeXSMD,
+        Circuit_Parts_TransistorXSMD,
+        Circuit_Parts_CapacitorXSMD
+    ));
 }