Remove a bunch of reflections against GT (#531)

* Remove a bunch of reflections against GT

* missed this one

5 files changed, 46 insertions, 162 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index aace371163..6741399289 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -55,87 +55,11 @@ public class LOADER_Machine_Components {
         CI.sensor_HV = ItemList.Sensor_HV.get(1);
         CI.sensor_EV = ItemList.Sensor_EV.get(1);
         CI.sensor_IV = ItemList.Sensor_IV.get(1);
-        CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
-        CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
-        CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
-        CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
-        CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
-    }
-
-    private static void registerGTExperimentalComponents() {
-        // GT++ Machine Components
-        CI.electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1);
-        CI.electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1);
-        CI.electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1);
-        CI.electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1);
-        CI.electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1);
-        CI.electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1);
-        CI.electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1);
-        CI.electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1);
-        CI.electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1);
-        CI.robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1);
-        CI.robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1);
-        CI.robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1);
-        CI.conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1);
-        CI.conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1);
-        CI.conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1);
-        CI.emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1);
-        CI.emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1);
-        CI.emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1);
-        CI.fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1);
-        CI.fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1);
-        CI.fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1);
-        CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
-        CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
-        CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
-
-        CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
-        CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
-        CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
-
-        registerComponentsULV();
-        registerComponentsMAX();
-    }
-
-    private static void registerGTStandardComponents() {
-        CI.electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1);
-        CI.electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1);
-        CI.electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1);
-        CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
-        CI.electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1);
-        CI.electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1);
-        CI.electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1);
-        CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
-        CI.electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1);
-        CI.electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1);
-        CI.electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1);
-        CI.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1);
-        CI.robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1);
-        CI.robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1);
-        CI.robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1);
-        CI.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1);
-        CI.conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1);
-        CI.conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1);
-        CI.conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1);
-        CI.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1);
-        CI.emitter_LuV = GregtechItemList.Emitter_LuV.get(1);
-        CI.emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1);
-        CI.emitter_UV = GregtechItemList.Emitter_UV.get(1);
-        CI.emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
-        CI.fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1);
-        CI.fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1);
-        CI.fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1);
-        CI.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
-        CI.sensor_LuV = GregtechItemList.Sensor_LuV.get(1);
-        CI.sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1);
-        CI.sensor_UV = GregtechItemList.Sensor_UV.get(1);
-        CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
-
-        CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
-        CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
-        CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
-
-        registerComponentsULV();
+        CI.fluidRegulator_LV = ItemList.FluidRegulator_LV.get(1);
+        CI.fluidRegulator_MV = ItemList.FluidRegulator_MV.get(1);
+        CI.fluidRegulator_HV = ItemList.FluidRegulator_HV.get(1);
+        CI.fluidRegulator_EV = ItemList.FluidRegulator_EV.get(1);
+        CI.fluidRegulator_IV = ItemList.FluidRegulator_IV.get(1);
     }
 
     private static void registerGTNHComponents() {
@@ -202,18 +126,4 @@ public class LOADER_Machine_Components {
         return true;
     }
 
-    private static boolean registerComponentsMAX() {
-
-        // Max Tier Components Blood Never added... Useless, lol.
-        CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
-        CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
-        CI.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1);
-        CI.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1);
-        CI.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1);
-        CI.emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
-        CI.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
-        CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
-
-        return true;
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 6912d3508e..3467b0614a 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1232,13 +1232,9 @@ public class RECIPES_GREGTECH {
                 30 * 20,
                 500);
 
-        ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
-        ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
-        ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
-        ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
-
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg1, CI.electricMotor_LV, CI.getTieredComponent(OrePrefixes.bolt, 1, 8),
+                new ItemStack[] { CI.fluidRegulator_LV, CI.electricMotor_LV,
+                        CI.getTieredComponent(OrePrefixes.bolt, 1, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) },
@@ -1247,7 +1243,8 @@ public class RECIPES_GREGTECH {
                 10 * 20,
                 30);
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg2, CI.electricMotor_MV, CI.getTieredComponent(OrePrefixes.bolt, 2, 8),
+                new ItemStack[] { CI.fluidRegulator_MV, CI.electricMotor_MV,
+                        CI.getTieredComponent(OrePrefixes.bolt, 2, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) },
@@ -1256,7 +1253,8 @@ public class RECIPES_GREGTECH {
                 10 * 20 * 2,
                 120);
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg3, CI.electricMotor_HV, CI.getTieredComponent(OrePrefixes.bolt, 3, 8),
+                new ItemStack[] { CI.fluidRegulator_HV, CI.electricMotor_HV,
+                        CI.getTieredComponent(OrePrefixes.bolt, 3, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) },
@@ -1266,7 +1264,8 @@ public class RECIPES_GREGTECH {
                 480);
 
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg4, CI.electricMotor_EV, CI.getTieredComponent(OrePrefixes.bolt, 4, 8),
+                new ItemStack[] { CI.fluidRegulator_EV, CI.electricMotor_EV,
+                        CI.getTieredComponent(OrePrefixes.bolt, 4, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) },
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index eb3f9ad2c3..96c1d940a8 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -25,7 +25,6 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 
 public class RECIPES_General {
@@ -255,24 +254,22 @@ public class RECIPES_General {
                     ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1));
         }
 
-        if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
-            CORE.RA.addSixSlotAssemblingRecipe(
-                    new ItemStack[] { CI.getNumberedAdvancedCircuit(4), ItemUtils.getSimpleStack(Blocks.glass, 16),
-                            ItemUtils.getSimpleStack(Blocks.glowstone, 16), ItemList.Large_Fluid_Cell_Steel.get(1) },
-                    FluidUtils.getFluidStack("molten.borosilicateglass", 2000),
-                    VolumetricFlaskHelper.getLargeVolumetricFlask(2),
-                    20 * 15,
-                    MaterialUtils.getVoltageForTier(3));
-
-            CORE.RA.addSixSlotAssemblingRecipe(
-                    new ItemStack[] { CI.getNumberedAdvancedCircuit(5), ItemUtils.getSimpleStack(Blocks.glass, 64),
-                            ItemUtils.getSimpleStack(Blocks.glowstone, 64),
-                            ItemList.Large_Fluid_Cell_TungstenSteel.get(1) },
-                    FluidUtils.getFluidStack("molten.borosilicateglass", 8000),
-                    VolumetricFlaskHelper.getGiganticVolumetricFlask(2),
-                    20 * 15,
-                    MaterialUtils.getVoltageForTier(5));
-        }
+        CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedAdvancedCircuit(4), ItemUtils.getSimpleStack(Blocks.glass, 16),
+                        ItemUtils.getSimpleStack(Blocks.glowstone, 16), ItemList.Large_Fluid_Cell_Steel.get(1) },
+                FluidUtils.getFluidStack("molten.borosilicateglass", 2000),
+                VolumetricFlaskHelper.getLargeVolumetricFlask(2),
+                20 * 15,
+                MaterialUtils.getVoltageForTier(3));
+
+        CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedAdvancedCircuit(5), ItemUtils.getSimpleStack(Blocks.glass, 64),
+                        ItemUtils.getSimpleStack(Blocks.glowstone, 64),
+                        ItemList.Large_Fluid_Cell_TungstenSteel.get(1) },
+                FluidUtils.getFluidStack("molten.borosilicateglass", 8000),
+                VolumetricFlaskHelper.getGiganticVolumetricFlask(2),
+                20 * 15,
+                MaterialUtils.getVoltageForTier(5));
 
         // Mining Explosive
         Logger.RECIPE("[Inspection] Explosives");
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 40352de898..a2c02b51c2 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -37,7 +37,6 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
@@ -1058,15 +1057,9 @@ public class RECIPES_Machines {
                 20 * 30,
                 30);
 
-        ItemStack aFluidRegulator1 = ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV);
-        ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList(
-                "FluidRegulator_IV",
-                2,
-                ItemUtils.getValueOfItemList("Electric_Pump_LuV", 4, ItemList.Electric_Pump_IV));
-
         // Poo Collector
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { CI.machineHull_MV, aFluidRegulator1,
+                new ItemStack[] { CI.machineHull_MV, ItemList.FluidRegulator_MV.get(2),
                         CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), ALLOY.EGLIN_STEEL.getPlate(4),
                         ALLOY.POTIN.getScrew(6) },
                 ALLOY.TUMBAGA.getFluidStack(144 * 4),
@@ -1077,7 +1070,7 @@ public class RECIPES_Machines {
         // Adv. Poo Collector
         CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { CI.getTieredMachineHull(-1), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
-                        aFluidRegulator2, CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4),
+                        ItemList.FluidRegulator_IV.get(2), CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4),
                         CI.getTieredComponent(OrePrefixes.screw, 6, 16) },
                 CI.getAlternativeTieredFluid(5, 144 * 9),
                 ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1),
@@ -1230,17 +1223,15 @@ public class RECIPES_Machines {
                 480);
 
         // Flask Configurator
-        if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
-            CORE.RA.addSixSlotAssemblingRecipe(
-                    new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2),
-                            ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
-                            VolumetricFlaskHelper.getVolumetricFlask(8),
-                            CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), CI.getPlate(2, 4) },
-                    CI.getAlternativeTieredFluid(1, 144 * 8),
-                    ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1),
-                    20 * 60,
-                    120);
-        }
+        CORE.RA.addSixSlotAssemblingRecipe(
+                new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2),
+                        ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
+                        VolumetricFlaskHelper.getVolumetricFlask(8), CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2),
+                        CI.getPlate(2, 4) },
+                CI.getAlternativeTieredFluid(1, 144 * 8),
+                ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1),
+                20 * 60,
+                120);
 
         if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) {
 
@@ -2282,8 +2273,6 @@ public class RECIPES_Machines {
         }
 
         // Air Intake Hatch
-        ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);
-        ItemStack aTieredFluidRegulator = FluidRegulator_IV.get(1);
         RecipeUtils.addShapedGregtechRecipe(
                 CI.component_Plate[6],
                 ItemList.Casing_Grate.get(1),
@@ -2635,16 +2624,9 @@ public class RECIPES_Machines {
         }
 
         if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
-
-            ItemStack aCoreBlock = ItemUtils.getValueOfItemList(
-                    "Block_IridiumTungstensteel",
-                    1,
-                    ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1));
-
-            aCoreBlock.stackSize = 1;
-
             CORE.RA.addSixSlotAssemblingRecipe(
-                    new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), aCoreBlock,
+                    new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
+                            ItemList.Block_IridiumTungstensteel.get(1),
                             CI.getTieredComponent(OrePrefixes.circuit, 2, 16),
                             CI.getTieredComponent(OrePrefixes.screw, 5, 32),
                             CI.getTieredComponent(OrePrefixes.bolt, 5, 12),
@@ -2887,8 +2869,6 @@ public class RECIPES_Machines {
             cell1 = CI.conveyorModule_LuV;
             cell2 = CI.electricMotor_LuV;
             ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
-            ItemStack aTieredUnboxinator = ItemUtils
-                    .getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1));
 
             RecipeUtils.addShapedRecipe(
                     plate,
@@ -2916,7 +2896,7 @@ public class RECIPES_Machines {
                     CI.getTieredCircuit(7),
                     casingAmazon,
                     CI.robotArm_LuV,
-                    aTieredUnboxinator,
+                    ItemList.Machine_LuV_Unboxinator.get(1),
                     CI.robotArm_LuV,
                     CI.conveyorModule_LuV,
                     GregtechItemList.Gregtech_Computer_Cube.get(1),
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index 03d4f66eb9..55dff5cbf7 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.core.recipe.common;
 
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -21,7 +21,6 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import ic2.core.Ic2Items;
 
 public class CI {
@@ -388,8 +387,7 @@ public class CI {
 
     public static void init() {
         // Set Explosives
-        explosivePowderKeg = ItemUtils
-                .getValueOfItemList("Block_Powderbarrel", 1, ItemUtils.getSimpleStack(Items.gunpowder, 16));
+        explosivePowderKeg = ItemList.Block_Powderbarrel.get(1);
         explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt).copy();
         explosiveITNT = Ic2Items.industrialTnt.copy();
 
@@ -974,7 +972,7 @@ public class CI {
         if (i > 8) {
             i = 8;
         }
-        return ItemUtils.simpleMetaStack(StaticFields59.getBlockCasings5(), i, 1);
+        return ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings5, i, 1);
     }
 
     public static ItemStack getNumberedBioCircuit(int i) {