Recipes ra2 (#1872)

* Recipes RA2 fixes

* Use \uXXXX for non-ASCII characters

* Misc cleanup (#1888)

* migrate away from addThermalCentrifugeRecipe

* split recipes of GT_Block_Stones_Abstract

* migrate away from addForgeHammerRecipe

* migrate away from addChemicalBathRecipe

* remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing

* Remove underground biomes ore classes, as it's not present in NH

* migrate away from addFluidCannerRecipe

* migrate away from addFluidExtractionRecipe

* migrate away from addChemicalRecipe

* migrate away from addMultiblockChemicalRecipe

* deprecate addChemicalRecipeForBasicMachineOnly

* migrate away from addCentrifugeRecipe

* spotlessApply

* fixing wrong merge conflict solving

* Add Tengam materials (#1891)

* Add Tengam materials

* Change new recipes to consume 15/16 Amp

* Remove now redundant `break` statements

* fix comb chances?

* fix centrifuge code not working

---------

Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

9 files changed, 498 insertions, 348 deletions

diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index 4aec0ed5c7..850fe21811 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -28,7 +28,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.items.GT_Generic_Item;
 import gregtech.api.util.GT_Utility;
 
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public class GT_FluidDisplayItem extends GT_Generic_Item {
 
     private static final Map<Fluid, String> sFluidTooltips = new HashMap<>();
@@ -132,11 +131,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
                         // For GT++ Fluid Display
                         // GT++ didn't register a Material in GT, so I have too find the Chemical Formula in its cell's
                         // tooltip
-                        List tTooltip = tContainer.getTooltip(null, true);
-                        for (Object tInfo : tTooltip) {
-                            if (!((String) tInfo).contains(" ") && !((String) tInfo).contains(":")
-                                && tTooltip.indexOf(tInfo) != 0) {
-                                return (String) tInfo;
+                        List<String> tTooltip = tContainer.getTooltip(null, true);
+                        for (String tInfo : tTooltip) {
+                            if (!tInfo.contains(" ") && !tInfo.contains(":") && tTooltip.indexOf(tInfo) != 0) {
+                                return tInfo;
                             }
                         }
                     }
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 739a3c7b9e..53daa4d813 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -2,6 +2,8 @@ package gregtech.common.items;
 
 import static gregtech.api.enums.Mods.GalacticraftMars;
 import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.client.GT_TooltipHandler.Tier.*;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
 
@@ -105,9 +107,19 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
 
         setBurnValue(17000 + Materials.Wood.mMetaItemSubID, 1600);
         GT_OreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));
-        GT_ModHandler.addCompressionRecipe(
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L),
-            new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));
+
+        // Compressor recipe
+        {
+            GT_Values.RA.stdBuilder()
+                .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L))
+                .itemOutputs(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+        }
+
         GregTech_API.registerCover(
             new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID),
             TextureFactory.of(COVER_WOOD_PLATE),
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index d419747c8a..da5f25a96f 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -2,6 +2,8 @@ package gregtech.common.items;
 
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.enchantment.Enchantment;
@@ -36,6 +38,8 @@ import gregtech.common.covers.redstone.GT_Cover_WirelessFluidDetector;
 import gregtech.common.covers.redstone.GT_Cover_WirelessItemDetector;
 import gregtech.common.covers.redstone.GT_Cover_WirelessMaintenanceDetector;
 import gregtech.common.items.behaviors.Behaviour_Arrow;
+import ic2.api.crops.CropCard;
+import ic2.api.crops.Crops;
 
 public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
 
@@ -2619,27 +2623,116 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             ItemList.Crop_Drop_Tine.get(1L),
             GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L));
 
-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L), new ItemStack(Blocks.wool, 1, 1));
-        GT_ModHandler
-            .addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler
-            .addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler
-            .addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler
-            .addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler.addCompressionRecipe(
-            ItemList.Crop_Drop_BobsYerUncleRanks.get(4L),
-            ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(4L), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler
-            .addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L));
-        GT_ModHandler.addCompressionRecipe(
-            new ItemStack(Blocks.yellow_flower, 8, 32767),
-            ItemList.IC2_PlantballCompressed.get(1L));
+        // Compression recipes
+        {
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Coppon.get(4L))
+                .itemOutputs(new ItemStack(Blocks.wool, 1, 1))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Argentia.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Indigo.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Ferru.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Aurelia.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_OilBerry.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Tine.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Crop_Drop_Rape.get(4L))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(new ItemStack(Blocks.red_flower, 8, 32767))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(new ItemStack(Blocks.yellow_flower, 8, 32767))
+                .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L))
+                .noFluidInputs()
+                .noFluidOutputs()
+                .duration(15 * SECONDS)
+                .eut(2)
+                .addTo(sCompressorRecipes);
+        }
 
         GT_ModHandler.addPulverisationRecipe(
             ItemList.Food_Sliced_Cheese.get(1L),
@@ -2699,10 +2792,10 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             32_000_000,
             100);
         try {
-            ic2.api.crops.CropCard tCrop;
-            GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop")
+            CropCard tCrop;
+            GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop")
                 .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L));
-            GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop")
+            GT_Utility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop")
                 .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L));
         } catch (Throwable e) {
             if (GT_Values.D1) {
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index 594c5841f5..015be426c8 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -26,7 +26,6 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
             OrePrefixes.crateGtPlate,
             OrePrefixes.nanite);
         INSTANCE = this;
-        int tLastID = 0;
         Object[] o = new Object[0];
 
         /**
@@ -36,9 +35,9 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
          * + sulfurci acid wetware lifesupport board / fiberglass CB + teflon +
          */
         ItemList.Circuit_Board_Wetware
-            .set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o));
-        ItemList.Circuit_Board_Plastic.set(addItem(tLastID = 7, "Plastic Circuit Board", "A Good Board", o));
-        ItemList.Circuit_Board_Bio.set(addItem(tLastID = 8, "Bio Circuit Board", "Bio genetic mutated Board", o));
+            .set(addItem(6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o));
+        ItemList.Circuit_Board_Plastic.set(addItem(7, "Plastic Circuit Board", "A Good Board", o));
+        ItemList.Circuit_Board_Bio.set(addItem(8, "Bio Circuit Board", "Bio genetic mutated Board", o));
 
         /**
          * electronic components: vacuum tube (glass tube + red alloy cables) basic electronic circuits normal+smd coils
@@ -46,68 +45,67 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
          */
         ItemList.Circuit_Parts_ResistorSMD.set(
             addItem(
-                tLastID = 11,
+                11,
                 "SMD Resistor",
                 "Electronic Component",
                 OrePrefixes.componentCircuit.get(Materials.Resistor),
                 SubTag.NO_UNIFICATION));
-        ItemList.Circuit_Parts_Glass_Tube.set(addItem(tLastID = 12, "Glass Tube", "", o));
-        ItemList.Circuit_Parts_Coil.set(addItem(tLastID = 14, "Small Coil", "Basic Electronic Component", o));
+        ItemList.Circuit_Parts_Glass_Tube.set(addItem(12, "Glass Tube", "", o));
+        ItemList.Circuit_Parts_Coil.set(addItem(14, "Small Coil", "Basic Electronic Component", o));
         ItemList.Circuit_Parts_DiodeSMD.set(
             addItem(
-                tLastID = 16,
+                16,
                 "SMD Diode",
                 "Electronic Component",
                 OrePrefixes.componentCircuit.get(Materials.Diode),
                 SubTag.NO_UNIFICATION));
         ItemList.Circuit_Parts_TransistorSMD.set(
             addItem(
-                tLastID = 18,
+                18,
                 "SMD Transistor",
                 "Electronic Component",
                 OrePrefixes.componentCircuit.get(Materials.Transistor),
                 SubTag.NO_UNIFICATION));
         ItemList.Circuit_Parts_CapacitorSMD.set(
             addItem(
-                tLastID = 20,
+                20,
                 "SMD Capacitor",
                 "Electronic Component",
                 OrePrefixes.componentCircuit.get(Materials.Capacitor),
                 SubTag.NO_UNIFICATION));
         ItemList.Circuit_Parts_GlassFiber
-            .set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o));
-        ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o));
-        ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o));
+            .set(addItem(21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o));
+        ItemList.Circuit_Parts_PetriDish.set(addItem(22, "Petri Dish", "For cultivating cells", o));
+        ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(23, "Reinforced Glass Tube", "", o));
 
         ItemList.Circuit_Parts_ResistorASMD
-            .set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o));
-        ItemList.Circuit_Parts_DiodeASMD
-            .set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o));
+            .set(addItem(24, "Advanced SMD Resistor", "Advanced Electronic Component", o));
+        ItemList.Circuit_Parts_DiodeASMD.set(addItem(25, "Advanced SMD Diode", "Advanced Electronic Component", o));
         ItemList.Circuit_Parts_TransistorASMD
-            .set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o));
+            .set(addItem(26, "Advanced SMD Transistor", "Advanced Electronic Component", o));
         ItemList.Circuit_Parts_CapacitorASMD
-            .set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o));
+            .set(addItem(27, "Advanced SMD Capacitor", "Advanced Electronic Component", o));
 
         ItemList.Circuit_Parts_ResistorXSMD
-            .set(addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o));
+            .set(addItem(178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o));
         ItemList.Circuit_Parts_DiodeXSMD
-            .set(addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o));
+            .set(addItem(179, "Optical SMD Diode", "Highly Advanced Electronic Component", o));
         ItemList.Circuit_Parts_TransistorXSMD
-            .set(addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o));
+            .set(addItem(180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o));
         ItemList.Circuit_Parts_CapacitorXSMD
-            .set(addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o));
+            .set(addItem(181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o));
 
         ItemList.Circuit_Parts_InductorSMD.set(
             addItem(
-                tLastID = 182,
+                182,
                 "SMD Inductor",
                 "Electronic Component",
                 OrePrefixes.componentCircuit.get(Materials.Inductor),
                 SubTag.NO_UNIFICATION));
         ItemList.Circuit_Parts_InductorASMD
-            .set(addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o));
+            .set(addItem(183, "Advanced SMD Inductor", "Advanced Electronic Component", o));
         ItemList.Circuit_Parts_InductorXSMD
-            .set(addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o));
+            .set(addItem(184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o));
 
         GT_OreDictUnificator
             .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L));
@@ -156,107 +154,104 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
          *
          * quantum chips
          */
-        ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Ingot.set(addItem(30, "Monocrystalline Silicon Boule", "Raw Circuit", o));
         ItemList.Circuit_Silicon_Ingot2
-            .set(addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+            .set(addItem(31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o));
         ItemList.Circuit_Silicon_Ingot3
-            .set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+            .set(addItem(32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));
         ItemList.Circuit_Silicon_Ingot4
-            .set(addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+            .set(addItem(150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
         ItemList.Circuit_Silicon_Ingot5
-            .set(addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Ingot6
-            .set(addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o));
+            .set(addItem(152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Ingot6.set(addItem(721, "Optically Enriched Crystalline Boule", "Raw Circuit", o));
 
-        ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Phosphorus doped Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Wafer3.set(addItem(tLastID = 35, "Naquadah doped Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Wafer4.set(addItem(tLastID = 151, "Europium doped Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Wafer5.set(addItem(tLastID = 153, "Americium doped Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Wafer6.set(addItem(tLastID = 722, "Photonically Prepared Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Wafer7.set(addItem(tLastID = 723, "Photonically Enhanced Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer.set(addItem(33, "Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer2.set(addItem(34, "Phosphorus doped Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer3.set(addItem(35, "Naquadah doped Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer4.set(addItem(151, "Europium doped Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer5.set(addItem(153, "Americium doped Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer6.set(addItem(722, "Photonically Prepared Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Wafer7.set(addItem(723, "Photonically Enhanced Wafer", "Raw Circuit", o));
 
-        ItemList.Circuit_Wafer_ILC.set(addItem(tLastID = 36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o));
-        ItemList.Circuit_Chip_ILC.set(addItem(tLastID = 37, "Integrated Logic Circuit", "Integrated Circuit", o));
+        ItemList.Circuit_Wafer_ILC.set(addItem(36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o));
+        ItemList.Circuit_Chip_ILC.set(addItem(37, "Integrated Logic Circuit", "Integrated Circuit", o));
 
-        ItemList.Circuit_Wafer_Ram.set(addItem(tLastID = 38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o));
-        ItemList.Circuit_Chip_Ram.set(addItem(tLastID = 39, "Random Access Memory Chip", "Integrated Circuit", o));
+        ItemList.Circuit_Wafer_Ram.set(addItem(38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o));
+        ItemList.Circuit_Chip_Ram.set(addItem(39, "Random Access Memory Chip", "Integrated Circuit", o));
 
-        ItemList.Circuit_Wafer_NAND.set(addItem(tLastID = 40, "NAND Memory Chip (Wafer)", "Raw Circuit", o));
-        ItemList.Circuit_Chip_NAND.set(addItem(tLastID = 41, "NAND Memory Chip", "Integrated Circuit", o));
+        ItemList.Circuit_Wafer_NAND.set(addItem(40, "NAND Memory Chip (Wafer)", "Raw Circuit", o));
+        ItemList.Circuit_Chip_NAND.set(addItem(41, "NAND Memory Chip", "Integrated Circuit", o));
 
-        ItemList.Circuit_Wafer_NOR.set(addItem(tLastID = 42, "NOR Memory Chip (Wafer)", "Raw Circuit", o));
-        ItemList.Circuit_Chip_NOR.set(addItem(tLastID = 43, "NOR Memory Chip", "Integrated Circuit", o));
+        ItemList.Circuit_Wafer_NOR.set(addItem(42, "NOR Memory Chip (Wafer)", "Raw Circuit", o));
+        ItemList.Circuit_Chip_NOR.set(addItem(43, "NOR Memory Chip", "Integrated Circuit", o));
 
-        ItemList.Circuit_Wafer_CPU.set(addItem(tLastID = 44, "Central Processing Unit (Wafer)", "Raw Circuit", o));
-        ItemList.Circuit_Chip_CPU.set(addItem(tLastID = 45, "Central Processing Unit", "Integrated Circuit", o));
+        ItemList.Circuit_Wafer_CPU.set(addItem(44, "Central Processing Unit (Wafer)", "Raw Circuit", o));
+        ItemList.Circuit_Chip_CPU.set(addItem(45, "Central Processing Unit", "Integrated Circuit", o));
 
-        ItemList.Circuit_Wafer_SoC.set(addItem(tLastID = 46, "SoC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_SoC.set(addItem(tLastID = 47, "SoC", "System on a Chip", o));
+        ItemList.Circuit_Wafer_SoC.set(addItem(46, "SoC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_SoC.set(addItem(47, "SoC", "System on a Chip", o));
 
-        ItemList.Circuit_Wafer_SoC2.set(addItem(tLastID = 48, "ASoC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_SoC2.set(addItem(tLastID = 49, "ASoC", "Advanced System on a Chip", o));
+        ItemList.Circuit_Wafer_SoC2.set(addItem(48, "ASoC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_SoC2.set(addItem(49, "ASoC", "Advanced System on a Chip", o));
 
-        ItemList.Circuit_Wafer_PIC.set(addItem(tLastID = 50, "PIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_PIC.set(addItem(tLastID = 51, "Power IC", "Power Circuit", o));
+        ItemList.Circuit_Wafer_PIC.set(addItem(50, "PIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_PIC.set(addItem(51, "Power IC", "Power Circuit", o));
 
-        ItemList.Circuit_Wafer_HPIC.set(addItem(tLastID = 52, "HPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_HPIC.set(addItem(tLastID = 53, "High Power IC", "High Power Circuit", o));
+        ItemList.Circuit_Wafer_HPIC.set(addItem(52, "HPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_HPIC.set(addItem(53, "High Power IC", "High Power Circuit", o));
 
-        ItemList.Circuit_Wafer_NanoCPU.set(addItem(tLastID = 54, "NanoCPU Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_NanoCPU
-            .set(addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o));
+        ItemList.Circuit_Wafer_NanoCPU.set(addItem(54, "NanoCPU Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_NanoCPU.set(addItem(55, "Nanocomponent Central Processing Unit", "Power Circuit", o));
 
-        ItemList.Circuit_Wafer_QuantumCPU.set(addItem(tLastID = 56, "QBit Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_QuantumCPU.set(addItem(tLastID = 57, "QBit Processing Unit", "Quantum CPU", o));
+        ItemList.Circuit_Wafer_QuantumCPU.set(addItem(56, "QBit Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_QuantumCPU.set(addItem(57, "QBit Processing Unit", "Quantum CPU", o));
 
-        ItemList.Circuit_Wafer_UHPIC.set(addItem(tLastID = 58, "UHPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_UHPIC.set(addItem(tLastID = 59, "Ultra High Power IC", "Ultra High Power Circuit", o));
+        ItemList.Circuit_Wafer_UHPIC.set(addItem(58, "UHPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_UHPIC.set(addItem(59, "Ultra High Power IC", "Ultra High Power Circuit", o));
 
-        ItemList.Circuit_Wafer_Simple_SoC.set(addItem(tLastID = 60, "Simple SoC Wafer", "Raw Primitive Circuit", o));
-        ItemList.Circuit_Chip_Simple_SoC.set(addItem(tLastID = 61, "Simple SoC", "Simple System on a Chip", o));
+        ItemList.Circuit_Wafer_Simple_SoC.set(addItem(60, "Simple SoC Wafer", "Raw Primitive Circuit", o));
+        ItemList.Circuit_Chip_Simple_SoC.set(addItem(61, "Simple SoC", "Simple System on a Chip", o));
 
-        ItemList.Circuit_Wafer_ULPIC.set(addItem(tLastID = 62, "ULPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_ULPIC.set(addItem(tLastID = 63, "Ultra Low Power IC", "Ultra Low Power Circuit", o));
+        ItemList.Circuit_Wafer_ULPIC.set(addItem(62, "ULPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_ULPIC.set(addItem(63, "Ultra Low Power IC", "Ultra Low Power Circuit", o));
 
-        ItemList.Circuit_Wafer_LPIC.set(addItem(tLastID = 64, "LPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_LPIC.set(addItem(tLastID = 65, "Low Power IC", "Low Power Circuit", o));
+        ItemList.Circuit_Wafer_LPIC.set(addItem(64, "LPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_LPIC.set(addItem(65, "Low Power IC", "Low Power Circuit", o));
 
-        ItemList.Circuit_Wafer_NPIC.set(addItem(tLastID = 160, "NPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_NPIC.set(addItem(tLastID = 161, "Nano Power IC", "Nano Power Circuit", o));
+        ItemList.Circuit_Wafer_NPIC.set(addItem(160, "NPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_NPIC.set(addItem(161, "Nano Power IC", "Nano Power Circuit", o));
 
-        ItemList.Circuit_Wafer_PPIC.set(addItem(tLastID = 162, "PPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_PPIC.set(addItem(tLastID = 163, "Piko Power IC", "Piko Power Circuit", o));
+        ItemList.Circuit_Wafer_PPIC.set(addItem(162, "PPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_PPIC.set(addItem(163, "Piko Power IC", "Piko Power Circuit", o));
 
-        ItemList.Circuit_Wafer_QPIC.set(addItem(tLastID = 164, "QPIC Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Chip_QPIC.set(addItem(tLastID = 165, "Quantum Power IC", "Quantum Power Circuit", o));
+        ItemList.Circuit_Wafer_QPIC.set(addItem(164, "QPIC Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Chip_QPIC.set(addItem(165, "Quantum Power IC", "Quantum Power Circuit", o));
 
-        ItemList.Circuit_Wafer_Bioware.set(addItem(tLastID = 188, "Living Bio Wafer", "Raw Circuit", o));
-        ItemList.Circuit_Parts_Chip_Bioware.set(addItem(tLastID = 189, "Living Bio Chip", "Needed for Circuits", o));
+        ItemList.Circuit_Wafer_Bioware.set(addItem(188, "Living Bio Wafer", "Raw Circuit", o));
+        ItemList.Circuit_Parts_Chip_Bioware.set(addItem(189, "Living Bio Chip", "Needed for Circuits", o));
         /**
          * Engraved Crystal Chip Engraved Lapotron Chip Crystal CPU SoCrystal stem cells (disassemble eggs)
          */
         ItemList.Circuit_Chip_CrystalSoC2
-            .set(addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o));
-        ItemList.Circuit_Parts_RawCrystalChip
-            .set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o));
-        ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal
-                                                                                                                  // chip
-                                                                                                                  // elite
-                                                                                                                  // part
-        ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o));
-        ItemList.Circuit_Chip_NeuroCPU.set(addItem(tLastID = 72, "Neuro Processing Unit", "Neuro CPU", o));
-        ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw inteligence", o));
+            .set(addItem(68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o));
+        ItemList.Circuit_Parts_RawCrystalChip.set(addItem(69, "Raw Crystal Chip", "Raw Crystal Processor", o));
+        ItemList.Circuit_Chip_CrystalCPU.set(addItem(70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal
+                                                                                                        // chip
+                                                                                                        // elite
+                                                                                                        // part
+        ItemList.Circuit_Chip_CrystalSoC.set(addItem(71, "Crystal SoC", "Crystal System on a Chip", o));
+        ItemList.Circuit_Chip_NeuroCPU.set(addItem(72, "Neuro Processing Unit", "Neuro CPU", o));
+        ItemList.Circuit_Chip_Stemcell.set(addItem(73, "Stemcells", "Raw inteligence", o));
         ItemList.Circuit_Parts_RawCrystalParts
-            .set(addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o));
-        ItemList.Circuit_Chip_Biocell.set(addItem(tLastID = 76, "Biocells", "Mutated Raw inteligence", o));
-        ItemList.Circuit_Chip_BioCPU.set(addItem(tLastID = 77, "Bio Processing Unit", "Bio CPU", o));
-        ItemList.Circuit_Chip_Optical.set(addItem(tLastID = 724, "Raw Exposed Optical Chip", "Raw Optical Chip", o));
+            .set(addItem(74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o));
+        ItemList.Circuit_Chip_Biocell.set(addItem(76, "Biocells", "Mutated Raw inteligence", o));
+        ItemList.Circuit_Chip_BioCPU.set(addItem(77, "Bio Processing Unit", "Bio CPU", o));
+        ItemList.Circuit_Chip_Optical.set(addItem(724, "Raw Exposed Optical Chip", "Raw Optical Chip", o));
 
         // Nand Chip
         ItemList.NandChip.set(
             addItem(
-                tLastID = 75,
+                75,
                 "NAND Chip",
                 "A very simple Circuit",
                 OrePrefixes.circuit.get(Materials.Primitive),
@@ -269,7 +264,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         // Integrated Logic Circuit Item01
         ItemList.Circuit_Integrated_Good.set(
             addItem(
-                tLastID = 79,
+                79,
                 "Good Integrated Circuit",
                 "Good Circuit",
                 OrePrefixes.circuit.get(Materials.Good),
@@ -280,7 +275,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
 
         ItemList.Circuit_Microprocessor.set(
             addItem(
-                tLastID = 78,
+                78,
                 "Microprocessor",
                 "A Basic Circuit",
                 OrePrefixes.circuit.get(Materials.Basic),
@@ -288,7 +283,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         registerTieredTooltip(ItemList.Circuit_Microprocessor.get(1), LV);
         ItemList.Circuit_Processor.set(
             addItem(
-                tLastID = 80,
+                80,
                 "Integrated Processor",
                 "A Good Circuit",
                 OrePrefixes.circuit.get(Materials.Good),
@@ -301,7 +296,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
 
         ItemList.Circuit_Nanoprocessor.set(
             addItem(
-                tLastID = 82,
+                82,
                 "Nanoprocessor",
                 "An Advanced Circuit",
                 OrePrefixes.circuit.get(Materials.Advanced),
@@ -309,7 +304,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         registerTieredTooltip(ItemList.Circuit_Nanoprocessor.get(1), HV);
         ItemList.Circuit_Nanocomputer.set(
             addItem(
-                tLastID = 83,
+                83,
                 "Nanoprocessor Assembly",
                 "An Extreme Circuit",
                 OrePrefixes.circuit.get(Materials.Data),
@@ -317,7 +312,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         registerTieredTooltip(ItemList.Circuit_Nanocomputer.get(1), EV);
         ItemList.Circuit_Elitenanocomputer.set(
             addItem(
-                tLastID = 84,
+                84,
                 "Elite Nanocomputer",
                 "An Elite Circuit",
                 OrePrefixes.circuit.get(Materials.Elite),
@@ -328,7 +323,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         // Quantum circuits
         ItemList.Circuit_Quantumprocessor.set(
             addItem(
-                tLastID = 85,
+                85,
                 "Quantumprocessor",
                 "An Extreme Circuit",
                 OrePrefixes.circuit.get(Materials.Data),
@@ -336,7 +331,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         registerTieredTooltip(ItemList.Circuit_Quantumprocessor.get(1), EV);
         ItemList.Circuit_Quantumcomputer.set(
             addItem(
-                tLastID = 86,
+                86,
                 "Quantumprocessor Assembly",
                 "An Elite Circuit",
                 OrePrefixes.circuit.get(Materials.Elite),
@@ -344,7 +339,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         registerTieredTooltip(ItemList.Circuit_Quantumcomputer.get(1), IV);
         ItemList.Circuit_Masterquantumcomputer.set(
             addItem(
-                tLastID = 87,
+                87,
                 "Master Quantumcomputer",
                 "A Master Circuit",
                 OrePrefixes.circuit.get(Materials.Master),
@@ -352,7 +347,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         registerTieredTooltip(ItemList.Circuit_Masterquantumcomputer.get(1), LuV);
         ItemList.Circuit_Quantummainframe.set(
             addItem(
-                tLastID = 88,
+                88,
                 "Quantumprocessor Mainframe",
                 "An Ultimate Circuit",
                 OrePrefixes.circuit.get(Materials.Ultimate),
@@ -362,7 +357,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 {
         // Crystal circuits
         ItemList.Circuit_Crystalprocessor.set(
             addItem(
-                tLastID = 89,
+                89,
                 "Crystalprocessor",
                 "An Elite Circuit",
                 OrePrefixes.circuit.get(Materials.Elite),
@@ -370,7 +365,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X3