Cleaning up (#767)

* Kill playerAPI

* Gut more events and compat that is now obsolete

* Remove commented out code

* Remove final modifier from methods

* Make more stuff final

* Remove slow building ring

* Protected -> private in final classes

* More cleaning

* More cleaning v2

* Purging

* Clean DevHelper

* Clean DevHelper 2

* delete DevHelper

* remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files

* check for obfuscation only once in the IFMLloadingPlugin.injectData

* don't instantiate the static class ASMConfig

* delete unused and empty implementation of IFMLCallHook

* delete empty class

* delete ClassesToTransform class that just holds the class names constants

* delete unused methods and unsless logging in dummymod container

* delete unused transformer ClassTransformer_TT_ThaumicRestorer

* spotless

* Clean

* Clean utils

* Build checkpoint

* Purge

* Stage 2

* Stage 3

* Stage 4

* Stage 5

* Stage 6

* Spotless

* Imports

* Stage idk

* Stage 1

* Fix issue

* Spotless

* Format numbers

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>

6 files changed, 131 insertions, 833 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 6741399289..a10d2cd05b 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.recipe;
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class LOADER_Machine_Components {
 
@@ -101,29 +100,15 @@ public class LOADER_Machine_Components {
         CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1);
 
         // Thanks 0lafe
-        CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1);
-        CI.electricPump_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32618, 1);
-        CI.electricPiston_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32648, 1);
-        CI.robotArm_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32658, 1);
-        CI.conveyorModule_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1);
-        CI.emitter_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32688, 1);
-        CI.fieldGenerator_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32678, 1);
-        CI.sensor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32698, 1);
-
-        registerComponentsULV();
-    }
+        CI.electricMotor_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1);
+        CI.electricPump_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32618, 1);
+        CI.electricPiston_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32648, 1);
+        CI.robotArm_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32658, 1);
+        CI.conveyorModule_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1);
+        CI.emitter_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32688, 1);
+        CI.fieldGenerator_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32678, 1);
+        CI.sensor_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32698, 1);
 
-    private static boolean registerComponentsULV() {
-
-        CI.electricMotor_ULV = GregtechItemList.Electric_Motor_ULV.get(1);
-        CI.electricPump_ULV = GregtechItemList.Electric_Pump_ULV.get(1);
-        CI.electricPiston_ULV = GregtechItemList.Electric_Piston_ULV.get(1);
-        CI.robotArm_ULV = GregtechItemList.Robot_Arm_ULV.get(1);
-        CI.conveyorModule_ULV = GregtechItemList.Conveyor_Module_ULV.get(1);
-        CI.emitter_ULV = GregtechItemList.Emitter_ULV.get(1);
-        CI.fieldGenerator_ULV = GregtechItemList.Field_Generator_ULV.get(1);
-        CI.sensor_ULV = GregtechItemList.Sensor_ULV.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 601b02cb6c..6e555c049e 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -14,16 +14,13 @@ import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtruderRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFusionRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLatheRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.BUCKETS;
 import static gregtech.api.util.GT_RecipeBuilder.HOURS;
 import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
@@ -60,7 +57,6 @@ import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
-import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
 import gtPlusPlus.core.lib.CORE;
@@ -88,7 +84,6 @@ public class RECIPES_GREGTECH {
     private static void execute() {
         electrolyzerRecipes();
         assemblerRecipes();
-        fluidCannerRecipes();
         distilleryRecipes();
         extractorRecipes();
         fluidExtractorRecipes();
@@ -108,8 +103,6 @@ public class RECIPES_GREGTECH {
         breweryRecipes();
         laserEngraverRecipes();
         assemblyLineRecipes();
-        latheRecipes();
-        vacuumFreezerRecipes();
         fluidHeaterRecipes();
         chemplantRecipes();
         alloySmelterRecipes();
@@ -270,24 +263,6 @@ public class RECIPES_GREGTECH {
                 .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sFluidHeaterRecipes);
     }
 
-    private static void vacuumFreezerRecipes() {
-        GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Molten.get(1))
-                .itemOutputs(GregtechItemList.Bomb_Cast_Set.get(1)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV)
-                .addTo(sVacuumRecipes);
-    }
-
-    private static void latheRecipes() {
-        GT_Values.RA.stdBuilder().itemInputs(ALLOY.EGLIN_STEEL.getBlock(1))
-                .itemOutputs(GregtechItemList.Bomb_Cast_Mold.get(1)).duration(15 * MINUTES).eut(TierEU.RECIPE_MV)
-                .addTo(sLatheRecipes);
-
-        GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Set.get(1))
-                .itemOutputs(
-                        GregtechItemList.Bomb_Cast_Broken.get(2),
-                        ItemUtils.getSimpleStack(ModItems.itemBombCasing, 2))
-                .duration(5 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sLatheRecipes);
-    }
-
     private static void fusionRecipes() {
         // Hypogen
         GT_Values.RA.stdBuilder()
@@ -474,7 +449,7 @@ public class RECIPES_GREGTECH {
                                 CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16),
                                 CI.getTieredComponent(OrePrefixes.screw, h, 16),
                                 CI.getTieredComponent(OrePrefixes.bolt, h - 2, 32),
-                                CI.getFieldGenerator(h, 1))
+                                CI.getFieldGenerator(h - 1, 1))
                         .fluidInputs(
                                 CI.getTieredFluid(h, 144 * 4 * 8),
                                 CI.getTertiaryTieredFluid(h - 1, 144 * 4 * 8),
@@ -536,15 +511,14 @@ public class RECIPES_GREGTECH {
     private static void laserEngraverRecipes() {
 
         // Laser Sensors and Emitters together
-        GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV,
-                GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV,
-                GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV,
-                GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV,
-                GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV,
-                GregtechItemList.TransmissionComponent_MAX, };
-        for (int i = 0; i < 10; i++) {
+        GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV,
+                GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV,
+                GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV,
+                GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM,
+                GregtechItemList.TransmissionComponent_UV, GregtechItemList.TransmissionComponent_UHV, };
+        for (int i = 1; i < aTransParts.length; i++) {
             GT_Values.RA.stdBuilder().itemInputs(CI.getEmitter(i, 2), CI.getSensor(i, 2))
-                    .itemOutputs(aTransParts[i].get(1)).duration(5 * SECONDS).eut(GT_Values.VP[i])
+                    .itemOutputs(aTransParts[i - 1].get(1)).duration(5 * SECONDS).eut(GT_Values.VP[i])
                     .addTo(sLaserEngraverRecipes);
         }
 
@@ -792,24 +766,6 @@ public class RECIPES_GREGTECH {
                 491520);
     }
 
-    private static void fluidCannerRecipes() {
-        // Sulfuric Acid
-        GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.glass_bottle))
-                .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion))
-                .fluidInputs(Materials.SulfuricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes);
-        GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion))
-                .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle))
-                .fluidOutputs(Materials.SulfuricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes);
-
-        // Hydrofluoric Acid
-        GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.glass_bottle))
-                .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion))
-                .fluidInputs(Materials.HydrofluoricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes);
-        GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion))
-                .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle))
-                .fluidOutputs(Materials.HydrofluoricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes);
-    }
-
     private static void dehydratorRecipes() {
         Logger.INFO("Loading Recipes for Chemical Dehydrator.");
 
@@ -986,13 +942,6 @@ public class RECIPES_GREGTECH {
 
         GT_Values.RA.stdBuilder()
                 .itemInputs(
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 32L),
-                        GregtechItemList.Bomb_Cast_Mold.get(0))
-                .itemOutputs(GregtechItemList.Bomb_Cast.get(4)).fluidInputs(Materials.Water.getFluid(4000L))
-                .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes);
-
-        GT_Values.RA.stdBuilder()
-                .itemInputs(
                         ItemUtils.getSimpleStack(CI.explosiveITNT, 2),
                         ItemUtils.getSimpleStack(CI.explosiveTNT, 4),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L),
@@ -1293,23 +1242,6 @@ public class RECIPES_GREGTECH {
 
     private static void chemicalReactorRecipes() {
 
-        // Bombs
-        GT_Values.RA.stdBuilder()
-                .itemInputs(
-                        ItemUtils.getSimpleStack(ModItems.itemBombCasing, 4),
-                        ItemUtils.getSimpleStack(RocketFuels.Ammonium_Nitrate_Dust, 8))
-                .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4))
-                .fluidInputs(Materials.Fuel.getFluid(1000)).duration(5 * MINUTES).eut(TierEU.RECIPE_LV)
-                .addTo(UniversalChemical);
-
-        GT_Values.RA.stdBuilder()
-                .itemInputs(
-                        ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4),
-                        ItemUtils.getSimpleStack(ModItems.itemDetCable, 4))
-                .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemBomb, 4))
-                .fluidInputs(FluidUtils.getFluidStack(RocketFuels.Kerosene, 100)).duration(10 * SECONDS)
-                .eut(TierEU.RECIPE_LV).addTo(UniversalChemical);
-
         GT_Values.RA.stdBuilder()
                 .itemInputs(
                         CI.getNumberedAdvancedCircuit(21),
@@ -1348,14 +1280,6 @@ public class RECIPES_GREGTECH {
                 .fluidInputs(Materials.Nitrogen.getGas(4000)).fluidOutputs().duration(1 * MINUTES).eut(TierEU.RECIPE_IV)
                 .metadata(COIL_HEAT, 4500).addTo(sBlastRecipes);
 
-        // Bomb Cast (Hot)
-        GT_Values.RA.stdBuilder()
-                .itemInputs(
-                        GregtechItemList.Bomb_Cast.get(4),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 16L))
-                .itemOutputs(GregtechItemList.Bomb_Cast_Molten.get(4)).fluidInputs(Materials.Oxygen.getGas(2000))
-                .fluidOutputs().duration(4 * MINUTES).eut(TierEU.RECIPE_HV).metadata(COIL_HEAT, 2800)
-                .addTo(sBlastRecipes);
     }
 
     private static void compressorRecipes() {
@@ -1377,10 +1301,6 @@ public class RECIPES_GREGTECH {
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)).duration(44 * SECONDS)
                 .eut(4).addTo(sMaceratorRecipes);
 
-        GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Broken.get(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 3L)).duration(20 * SECONDS)
-                .eut(2).addTo(sMaceratorRecipes);
-
         if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) {
             GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1))
                     .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L))
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index 99fd4cfb15..35009804df 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -49,8 +49,6 @@ public class RECIPES_General {
     static String RECIPE_BronzePlate = "plateBronze";
     static String RECIPE_StainlessPlate = "plateStainlessSteel";
     static ItemStack RECIPE_BasicCasingIC2;
-    static ItemStack OUTPUT_Workbench_Bronze;
-    static ItemStack OUTPUT_Workbench_Advanced;
     static ItemStack RECIPE_HydrogenDust;
 
     public static void loadRecipes() {
@@ -61,8 +59,6 @@ public class RECIPES_General {
         RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
         RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);
         RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1);
-        OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1);
-        OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1);
         OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2);
         run();
         addCompressedObsidian();
@@ -83,31 +79,6 @@ public class RECIPES_General {
                 NULL,
                 OUTPUT_Blueprint);
 
-        // Bronze Workbench
-        RecipeUtils.addShapedRecipe(
-                RECIPE_BronzePlate,
-                RECIPE_CraftingTable,
-                RECIPE_BronzePlate,
-                RECIPE_BronzePlate,
-                RECIPE_BasicCasingIC2,
-                RECIPE_BronzePlate,
-                RECIPE_BronzePlate,
-                CI.getTieredCircuitOreDictName(0),
-                RECIPE_BronzePlate,
-                OUTPUT_Workbench_Bronze);
-
-        RecipeUtils.addShapedRecipe(
-                RECIPE_StainlessPlate,
-                CI.getTieredCircuitOreDictName(3),
-                RECIPE_StainlessPlate,
-                RECIPE_StainlessPlate,
-                OUTPUT_Workbench_Bronze,
-                RECIPE_StainlessPlate,
-                RECIPE_StainlessPlate,
-                CI.getTieredCircuitOreDictName(3),
-                RECIPE_StainlessPlate,
-                OUTPUT_Workbench_Advanced);
-
         // Rainforest oak Sapling
         if (RecipeUtils.addShapedRecipe(
                 "stickWood",
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 29a09fc2b4..4929872caa 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -1,194 +1,10 @@
 package gtPlusPlus.core.recipe;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
-
 public class RECIPES_MachineComponents {
 
-    // Wire
-    public static String wireTier0 = "wireGt01Lead";
-    public static String wireTier1 = "wireGt01RedAlloy";
-    public static String wireTier6 = "wireGt08NiobiumTitanium";
-    public static String wireTier7 = "wireGt08Osmium";
-    public static String wireTier8 = "wireGt08Naquadah";
-    public static String wireTier9 = "wireGt08Superconductor";
-    public static String wireTier10 = "wireGt16Superconductor";
-
-    // Cable
-    public static String cableTier0 = "cableGt01Lead";
-    public static String cableTier1 = "cableGt01RedAlloy";
-    public static String cableTier6 = "cableGt04Tungsten";
-    public static String cableTier7 = "cableGt04NiobiumTitanium";
-    public static String cableTier8 = "cableGt04Osmium";
-    public static String cableTier9 = "cableGt04Naquadah";
-    public static String cableTier10 = "wireGt08Superconductor";
-
-    // Plates
-    public static String plateTier0 = "plateWroughtIron";
-    public static String plateTier7 = "plateChrome";
-    public static String plateTier8 = "plateIridium";
-    public static String plateTier9 = "plateOsmium";
-    public static String plateTier10 = "plateNeutronium";
-
-    // rods
-    public static String rodTier0 = "stickWroughtIron";
-    public static String rodTier1 = "stickPotin";
-    public static String rodTier2 = "stickIronMagnetic";
-    public static String rodTier7a = "stickChrome";
-    public static String rodTier8a = "stickIridium";
-    public static String rodTier9a = "stickOsmium";
-    public static String rodTier10a = "stickNeutronium";
-    public static String rodTier7b = "stickPlatinum";
-    public static String rodTier8b = "stickChrome";
-    public static String rodTier9b = "stickIridium";
-    public static String rodTier10b = "stickOsmium";
-    public static String rodTier7c = "stickTitanium";
-    public static String rodTier8c = "stickTungstenSteel";
-    public static String rodTier9c = "stickNaquadah";
-    public static String rodTier10c = "stickOsmium";
-
-    // Screws
-    public static String screwTier0 = "screwPotin";
-    public static String screwTier7 = "screwChrome";
-    public static String screwTier8 = "screwIridium";
-    public static String screwTier9 = "screwOsmium";
-    public static String screwTier10 = "screwNeutronium";
-
-    // Rotors
-    public static String rotorTier0 = "rotorPotin";
-    public static String rotorTier7 = "rotorChrome";
-    public static String rotorTier8 = "rotorIridium";
-    public static String rotorTier9 = "rotorOsmium";
-    public static String rotorTier10 = "rotorNeutronium";
-
     // Fluid Pipe
-    public static String pipeTier0 = "pipeSmallLead";
     public static String pipeTier7 = "pipeHugeSteel";
     public static String pipeTier8 = "pipeHugeStainlessSteel";
     public static String pipeTier9 = "pipeHugeTitanium";
-    public static String pipeTier10 = "pipeHugeTungstenSteel";
-
-    // Rubber Ring/Plate
-    public static String itemRubberRing = "ringRubber";
-    public static String plateRubber = "plateRubber";
-
-    // Circuits
-    public static String circuitTier0 = "circuitPrimitive";
-    public static String circuitTier1 = "circuitBasic";
-    public static String circuitTier6 = "circuitMaster";
-    public static String circuitTier7 = "circuitUltimate";
-    public static String circuitTier8 = "circuitSuperconductor";
-    public static String circuitTier9 = "circuitInfinite";
-    public static String circuitTier10 = "circuitQuantum";
-
-    // small gears
-    public static String smallGearTier0 = "gearGtSmallWroughtIron";
-    public static String smallGearTier7 = "gearGtSmallChrome";
-    public static String smallGearTier8 = "gearGtSmallIridium";
-    public static String smallGearTier9 = "gearGtSmallOsmium";
-    public static String smallGearTier10 = "gearGtSmallNeutronium";
-
-    public static final void loadRecipes() {
-        Logger.INFO("Loading Recipes for the Various Circuits and Machine components.");
-        onlyULVComponents();
-    }
-
-    private static void onlyULVComponents() {
-        RecipeUtils.addShapedGregtechRecipe(
-                cableTier1,
-                wireTier0,
-                rodTier0,
-                wireTier0,
-                rodTier2,
-                wireTier0,
-                rodTier0,
-                wireTier0,
-                cableTier1,
-                CI.electricMotor_ULV);
-
-        RecipeUtils.addShapedGregtechRecipe(
-                cableTier0,
-                rotorTier0,
-                itemRubberRing,
-                CI.craftingToolScrewdriver,
-                pipeTier0,
-                CI.craftingToolWrench,
-                itemRubberRing,
-                CI.electricMotor_ULV,
-                cableTier0,
-                CI.electricPump_ULV);
-
-        RecipeUtils.addShapedGregtechRecipe(
-                plateTier0,
-                plateTier0,
-                plateTier0,
-                cableTier0,
-                rodTier1,
-                rodTier1,
-                cableTier0,
-                CI.electricMotor_ULV,
-                smallGearTier0,
-                CI.electricPiston_ULV);
-
-        RecipeUtils.addShapedGregtechRecipe(
-                cableTier0,
-                cableTier0,
-                cableTier0,
-                CI.electricMotor_ULV,
-                rodTier1,
-                CI.electricMotor_ULV,
-                CI.electricPiston_ULV,
-                circuitTier0,
-                rodTier1,
-                CI.robotArm_ULV);
-
-        RecipeUtils.addShapedGregtechRecipe(
-                plateRubber,
-                plateRubber,
-                plateRubber,
-                CI.electricMotor_ULV,
-                cableTier0,
-                CI.electricMotor_ULV,
-                plateRubber,
-                plateRubber,
-                plateRubber,
-                CI.conveyorModule_ULV);
-
-        RecipeUtils.addShapedGregtechRecipe(
-                rodTier2,
-                rodTier2,
-                circuitTier0,
-                cableTier0,
-                circuitTier1,
-                rodTier2,
-                circuitTier0,
-                cableTier0,
-                rodTier2,
-                CI.emitter_ULV);
-
-        RecipeUtils.addShapedGregtechRecipe(
-                wireTier0,
-                circuitTier0,
-                wireTier0,
-                circuitTier0,
-                circuitTier1,
-                circuitTier0,
-                wireTier0,
-                circuitTier0,
-                wireTier0,
-                CI.fieldGenerator_ULV);
 
-        RecipeUtils.addShapedRecipe(
-                plateTier0,
-                null,
-                circuitTier1,
-                plateTier0,
-                rodTier2,
-                null,
-                circuitTier0,
-                plateTier0,
-                plateTier0,
-                CI.sensor_ULV);
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index bd75847153..2016a6582c 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,6 +1,12 @@
 package gtPlusPlus.core.recipe;
 
-import static gregtech.api.enums.Mods.*;
+import static gregtech.api.enums.Mods.BartWorks;
+import static gregtech.api.enums.Mods.COFHCore;
+import static gregtech.api.enums.Mods.EternalSingularity;
+import static gregtech.api.enums.Mods.GoodGenerator;
+import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.Railcraft;
+import static gregtech.api.enums.Mods.RemoteIO;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -43,10 +49,6 @@ import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 public class RECIPES_Machines {
 
     // Outputs
-    // static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore);
-    public static ItemStack RECIPE_SteamCondenser;
-    public static ItemStack RECIPE_IronBlastFurnace;
-    public static ItemStack RECIPE_IronPlatedBricks;
     public static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1);
     public static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1);
     public static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1);
@@ -235,8 +237,6 @@ public class RECIPES_Machines {
         fakeMachineCasingCovers();
         overflowValveCovers();
         superBuses();
-        roundRobinators();
-        chunkloaders();
         distillus();
         algaeFarm();
         chemPlant();
@@ -250,10 +250,8 @@ public class RECIPES_Machines {
         chiselBuses();
 
         gt4FarmManager();
-        gt4Redstone();
         gt4Inventory();
 
-        // multiGeneratorArray();
         multiForgeHammer();
         multiMolecularTransformer();
         multiXlTurbines();
@@ -325,149 +323,15 @@ public class RECIPES_Machines {
         }
     }
 
-    private static void gt4Redstone() {
-
-        RecipeUtils.addShapedRecipe(
-                "plateIron",
-                "plateGlass",
-                "plateIron",
-                "plateGlass",
-                ItemUtils.getSimpleStack(Blocks.redstone_lamp),
-                "plateGlass",
-                "plateIron",
-                "plateGlass",
-                "plateIron",
-                GregtechItemList.GT4_Redstone_Lamp.get(2));
-        RecipeUtils.addShapedRecipe(
-                "plateAluminium",
-                "plateGlass",
-                "plateAluminium",
-                "plateGlass",
-                ItemUtils.getSimpleStack(Blocks.redstone_lamp),
-                "plateGlass",
-                "plateAluminium",
-                "plateGlass",
-                "plateAluminium",
-                GregtechItemList.GT4_Redstone_Lamp.get(8));
-
-        RecipeUtils.addShapedRecipe(
-                "plateIron",
-                "plateIron",
-                "plateIron",
-                ItemUtils.getSimpleStack(Items.comparator),
-                ItemList.Cover_Screen.get(1),
-                ItemUtils.getSimpleStack(Items.comparator),
-                "plateIron",
-                "plateIron",
-                "plateIron",
-                GregtechItemList.GT4_Redstone_Display.get(2));
-        RecipeUtils.addShapedRecipe(
-                "plateAluminium",
-                "plateAluminium",
-                "plateAluminium",
-                ItemUtils.getSimpleStack(Items.comparator),
-                ItemList.Cover_Screen.get(1),
-                ItemUtils.getSimpleStack(Items.comparator),
-                "plateAluminium",
-                "plateAluminium",
-                "plateAluminium",
-                GregtechItemList.GT4_Redstone_Display.get(8));
-
-        RecipeUtils.addShapedRecipe(
-                "plateIron",
-                "plateIron",
-                "plateIron",
-                ItemUtils.getSimpleStack(Items.comparator),
-                ItemList.Cover_EnergyDetector.get(1),
-                ItemUtils.getSimpleStack(Items.comparator),
-                "plateIron",
-                "plateIron",
-                "plateIron",
-                GregtechItemList.GT4_Redstone_Scale.get(2));
-        RecipeUtils.addShapedRecipe(
-                "plateAluminium",
-                "plateAluminium",
-                "plateAluminium",
-                ItemUtils.getSimpleStack(Items.comparator),
-                ItemList.Cover_EnergyDetector.get(1),
-                ItemUtils.getSimpleStack(Items.comparator),
-                "plateAluminium",
-                "plateAluminium",
-                "plateAluminium",
-                GregtechItemList.GT4_Redstone_Scale.get(8));
-
-        CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { CI.getTieredMachineHull(1), ItemUtils.getSimpleStack(Blocks.stone_button, 16) },
-                null,
-                GregtechItemList.GT4_Redstone_Button_Panel.get(1),
-                800,
-                4);
-
-        RecipeUtils.addShapedRecipe(
-                "plateIron",
-                ItemUtils.getSimpleStack(Items.repeater),
-                "plateIron",
-                ItemUtils.getSimpleStack(Items.comparator),
-                CI.getTieredCircuitOreDictName(1),
-                ItemUtils.getSimpleStack(Items.comparator),
-                "plateIron",
-                ItemUtils.getSimpleStack(Items.repeater),
-                "plateIron",
-                GregtechItemList.GT4_Redstone_Circuit.get(1));
-        RecipeUtils.addShapedRecipe(
-                "plateAluminium",
-                ItemUtils.getSimpleStack(Items.repeater),
-                "plateAluminium",
-                ItemUtils.getSimpleStack(Items.comparator),
-                CI.getTieredCircuitOreDictName(1),
-                ItemUtils.getSimpleStack(Items.comparator),
-                "plateAluminium",
-                ItemUtils.getSimpleStack(Items.repeater),
-                "plateAluminium",
-                GregtechItemList.GT4_Redstone_Circuit.get(2));
-    }
-
     private static void gt4Inventory() {
 
-        ItemList[] aEnergyHatches = new ItemList[] { ItemList.Hatch_Energy_LV, ItemList.Hatch_Energy_MV,
-                ItemList.Hatch_Energy_HV, ItemList.Hatch_Energy_EV, ItemList.Hatch_Energy_IV, ItemList.Hatch_Energy_LuV,
-                ItemList.Hatch_Energy_ZPM, ItemList.Hatch_Energy_UV };
-
-        ItemList[] aRegulators = new ItemList[] { ItemList.Automation_Regulator_LV, ItemList.Automation_Regulator_MV,
-                ItemList.Automation_Regulator_HV, ItemList.Automation_Regulator_EV, ItemList.Automation_Regulator_IV,
-                ItemList.Automation_Regulator_LuV, ItemList.Automation_Regulator_ZPM,
-                ItemList.Automation_Regulator_UV };
-
-        GregtechItemList[] aOutputInventoryManager = new GregtechItemList[] {
-                GregtechItemList.GT4_Electric_Inventory_Manager_LV, GregtechItemList.GT4_Electric_Inventory_Manager_MV,
-                GregtechItemList.GT4_Electric_Inventory_Manager_HV, GregtechItemList.GT4_Electric_Inventory_Manager_EV,
-                GregtechItemList.GT4_Electric_Inventory_Manager_IV, GregtechItemList.GT4_Electric_Inventory_Manager_LuV,
-                GregtechItemList.GT4_Electric_Inventory_Manager_ZPM,
-                GregtechItemList.GT4_Electric_Inventory_Manager_UV };
-
-        int aTier = 1;
-        for (int i = 0; i < 8; i++) {
-            RecipeUtils.addShapedRecipe(
-                    CI.getTieredCircuitOreDictName(aTier),
-                    aRegulators[i].get(1),
-                    CI.getTieredCircuitOreDictName(aTier),
-                    CI.getRobotArm(aTier, 1),
-                    CI.getTieredMachineHull(aTier),
-                    CI.getRobotArm(aTier, 1),
-                    CI.getTieredCircuitOreDictName(aTier),
-                    aEnergyHatches[i].get(1),
-                    CI.getTieredCircuitOreDictName(aTier),
-                    aOutputInventoryManager[i].get(1));
-            aTier++;
-        }
-
         GregtechItemList[] aOutputElectricCraftingTable = new GregtechItemList[] {
                 GregtechItemList.GT4_Electric_Auto_Workbench_LV, GregtechItemList.GT4_Electric_Auto_Workbench_MV,
                 GregtechItemList.GT4_Electric_Auto_Workbench_HV, GregtechItemList.GT4_Electric_Auto_Workbench_EV,
                 GregtechItemList.GT4_Electric_Auto_Workbench_IV, GregtechItemList.GT4_Electric_Auto_Workbench_LuV,
                 GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, GregtechItemList.GT4_Electric_Auto_Workbench_UV };
 
-        aTier = 1;
+        int aTier = 1;
         for (int i = 0; i < 8; i++) {
             RecipeUtils.addShapedRecipe(
                     ItemUtils.getOrePrefixStack(OrePrefixes.plate, CI.tieredMaterials[aTier], 1),
@@ -529,7 +393,7 @@ public class RECIPES_Machines {
                         ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), },
                 GregtechItemList.Controller_MolecularTransformer.get(1),
                 20 * 60 * 10 * (1),
-                (int) MaterialUtils.getVoltageForTier(6));
+                MaterialUtils.getVoltageForTier(6));
 
         CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPlate(6, 4), CI.getScrew(6, 8),
@@ -881,39 +745,16 @@ public class RECIPES_Machines {
                 5);
     }
 
-    private static void chunkloaders() {
-
-        ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.GT_Chunkloader_HV.get(1L),
-                GregtechItemList.GT_Chunkloader_IV.get(1L), GregtechItemList.GT_Chunkloader_ZPM.get(1L), };
-
-        int aIndex = 0;
-
-        for (int i = 3; i < 8; i++) {
-            if (i == 4 || i == 6) {
-                continue;
-            }
-            CORE.RA.addSixSlotAssemblingRecipe(
-                    new ItemStack[] { CI.getNumberedAdvancedCircuit(21), CI.getElectricPiston(i, 10),
-                            CI.getFieldGenerator(i + 1, 6), CI.getPlate(i, 16), CI.getTransmissionComponent(i - 1, 8),
-                            CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) },
-                    ALLOY.EGLIN_STEEL.getFluidStack(i * (144 * 4)),
-                    aOutputs[aIndex++].copy(),
-                    300 * 20,
-                    MaterialUtils.getVoltageForTier(i));
-        }
-    }
-
     private static void overflowValveCovers() {
-        ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_ULV.get(1L),
-                GregtechItemList.Cover_Overflow_LV.get(1L), GregtechItemList.Cover_Overflow_MV.get(1L),
-                GregtechItemList.Cover_Overflow_HV.get(1L), GregtechItemList.Cover_Overflow_EV.get(1L),
-                GregtechItemList.Cover_Overflow_IV.get(1L), };
+        ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_LV.get(1L),
+                GregtechItemList.Cover_Overflow_MV.get(1L), GregtechItemList.Cover_Overflow_HV.get(1L),
+                GregtechItemList.Cover_Overflow_EV.get(1L), GregtechItemList.Cover_Overflow_IV.get(1L), };
 
-        for (int i = 0; i < 6; i++) {
+        for (int i = 1; i < aOutputs.length; i++) {
             CORE.RA.addSixSlotAssemblingRecipe(
                     new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getElectricPump(i, 2), CI.getElectricMotor(i, 2),
                             CI.getPlate(i, 4) },
-                    Materials.SolderingAlloy.getFluid(i * (144 * 1)),
+                    Materials.SolderingAlloy.getFluid(i * (144)),
                     aOutputs[i].copy(),