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>

23 files changed, 44 insertions, 328 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
index 247cdb890b..be4accba19 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
@@ -49,8 +49,8 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
         Logger.MATERIALS("Materials to attempt tool gen. with: " + size);
         int used = 0;
         Materials aMaterial = null;
-        for (int r = 0; r < size; r++) {
-            aMaterial = i[r];
+        for (Materials materials : i) {
+            aMaterial = materials;
             if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
                     && (aMaterial != Materials.Rubber)
                     && (aMaterial != Materials._NULL)) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
deleted file mode 100644
index f1493f2e63..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package gtPlusPlus.xmod.gregtech.loaders;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-
-public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegistrator, Runnable {
-
-    public ProcessingElectricButcherKnife() {
-        GregtechOrePrefixes.toolElectricButcherKnife.add(this);
-    }
-
-    @Override
-    public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
-            final String aModName, final ItemStack aStack) {
-        if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
-            if (aMaterial != Materials.Rubber) {
-                if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
-                        && (!aMaterial.contains(SubTag.NO_SMASHING))) {}
-            }
-        }
-    }
-
-    @Override
-    public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
-            final String aModName, final ItemStack aStack) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void materialsLoops() {
-        final Materials[] i = Materials.values();
-        final int size = i.length;
-        Logger.MATERIALS("Materials to attempt tool gen. with: " + size);
-        int used = 0;
-        Materials aMaterial = null;
-        for (int r = 0; r < size; r++) {
-            aMaterial = i[r];
-            if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
-                    && (aMaterial != Materials.Rubber)
-                    && (aMaterial != Materials._NULL)) {
-                if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
-                        && (!aMaterial.contains(SubTag.NO_SMASHING))
-                        && (!aMaterial.contains(SubTag.TRANSPARENT))
-                        && (!aMaterial.contains(SubTag.FLAMMABLE))
-                        && (!aMaterial.contains(SubTag.MAGICAL))
-                        && (!aMaterial.contains(SubTag.NO_SMELTING))) {
-                    Logger.MATERIALS(
-                            "Generating Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial));
-                    // Input 1
-
-                    final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
-                    final ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L);
-
-                    if ((null != plate) && screw != null) {
-                        addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1));
-                        addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1));
-                        addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1));
-                        used++;
-                    } else {
-                        Logger.MATERIALS(
-                                "Unable to generate Electric Butcher Knife from "
-                                        + MaterialUtils.getMaterialName(aMaterial)
-                                        + ", Plate or Long Rod may be invalid. Invalid | Plate? "
-                                        + (plate == null)
-                                        + " | Rod? "
-                                        + " |");
-                    }
-                    // GT_ModHandler.addCraftingRecipe(,
-                    // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
-                    // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ",
-                    // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial),
-                    // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
-                    // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
-                } else {
-                    Logger.MATERIALS(
-                            "Unable to generate Electric Butcher Knife from "
-                                    + MaterialUtils.getMaterialName(aMaterial));
-                }
-            } else {
-                Logger.MATERIALS(
-                        "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial));
-            }
-        }
-
-        Logger.INFO("Materials used for tool gen: " + used);
-    }
-
-    @Override
-    public void run() {
-        Logger.INFO("Generating Electric Butcher Knives for all valid GT Materials.");
-        this.materialsLoops();
-    }
-
-    public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
-
-        ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
-                MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE,
-                1,
-                aMaterial,
-                Materials.Titanium,
-                new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
-
-        ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null);
-
-        long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
-        if (aDura <= 32000) {
-            Logger.MATERIALS(
-                    "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)
-                            + ", Durability: "
-                            + aDura);
-            return false;
-        }
-
-        return RecipeUtils.addShapedRecipe(
-                OrePrefixes.wireFine.get(Materials.Electrum),
-                aInputCutter,
-                OrePrefixes.wireFine.get(Materials.Electrum),
-                OrePrefixes.plate.get(aMaterial),
-                CI.getElectricMotor(aVoltageTier, 1),
-                OrePrefixes.plate.get(aMaterial),
-                OrePrefixes.screw.get(aMaterial),
-                aBattery,
-                OrePrefixes.screw.get(aMaterial),
-                aOutputStack);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
deleted file mode 100644
index ee1cbc2744..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package gtPlusPlus.xmod.gregtech.loaders;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-
-public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator, Runnable {
-
-    public ProcessingElectricLighter() {
-        GregtechOrePrefixes.toolElectricLighter.add(this);
-    }
-
-    @Override
-    public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
-            final String aModName, final ItemStack aStack) {
-        if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
-            if (aMaterial != Materials.Rubber) {
-                if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
-                        && (!aMaterial.contains(SubTag.NO_SMASHING))) {}
-            }
-        }
-    }
-
-    @Override
-    public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
-            final String aModName, final ItemStack aStack) {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void materialsLoops() {
-        final Materials[] i = Materials.values();
-        final int size = i.length;
-        Logger.MATERIALS("Materials to attempt tool gen. with: " + size);
-        int used = 0;
-        Materials aMaterial = null;
-        for (int r = 0; r < size; r++) {
-            aMaterial = i[r];
-            if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
-                    && (aMaterial != Materials.Rubber)
-                    && (aMaterial != Materials._NULL)) {
-                if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
-                        && (!aMaterial.contains(SubTag.NO_SMASHING))
-                        && (!aMaterial.contains(SubTag.TRANSPARENT))
-                        && (!aMaterial.contains(SubTag.FLAMMABLE))
-                        && (!aMaterial.contains(SubTag.MAGICAL))
-                        && (!aMaterial.contains(SubTag.NO_SMELTING))) {
-                    Logger.MATERIALS("Generating Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial));
-                    // Input 1
-
-                    final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
-
-                    if ((null != plate)) {
-                        addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1));
-                        addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1));
-                        addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1));
-                        used++;
-                    } else {
-                        Logger.MATERIALS(
-                                "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)
-                                        + ", Plate or Long Rod may be invalid. Invalid | Plate? "
-                                        + (plate == null)
-                                        + " | Rod? "
-                                        + " |");
-                    }
-                    // GT_ModHandler.addCraftingRecipe(,
-                    // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
-                    // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ",
-                    // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial),
-                    // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
-                    // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
-                } else {
-                    Logger.MATERIALS(
-                            "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial));
-                }
-            } else {
-                Logger.MATERIALS(
-                        "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial));
-            }
-        }
-
-        Logger.INFO("Materials used for tool gen: " + used);
-    }
-
-    @Override
-    public void run() {
-        Logger.INFO("Generating Electric Lighters for all valid GT Materials.");
-        this.materialsLoops();
-    }
-
-    public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
-
-        ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
-                MetaGeneratedGregtechTools.ELECTRIC_LIGHTER,
-                1,
-                aMaterial,
-                Materials.Titanium,
-                new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
-
-        ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null);
-
-        long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
-        if (aDura <= 32000) {
-            Logger.MATERIALS(
-                    "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)
-                            + ", Durability: "
-                            + aDura);
-            return false;
-        }
-
-        return RecipeUtils.addShapedRecipe(
-                OrePrefixes.wireGt04.get(Materials.Gold),
-                aInputCutter,
-                OrePrefixes.wireGt04.get(Materials.Gold),
-                ELEMENT.STANDALONE.RUNITE.getPlate(1),
-                CI.getSensor(aVoltageTier, 1),
-                ELEMENT.STANDALONE.RUNITE.getPlate(1),
-                OrePrefixes.plate.get(aMaterial),
-                aBattery,
-                OrePrefixes.plate.get(aMaterial),
-                aOutputStack);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
index a431d4a500..3b9d5b8e0c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
@@ -49,8 +49,8 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
         Logger.MATERIALS("Materials to attempt tool gen. with: " + size);
         int used = 0;
         Materials aMaterial = null;
-        for (int r = 0; r < size; r++) {
-            aMaterial = i[r];
+        for (Materials materials : i) {
+            aMaterial = materials;
             if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
                     && (aMaterial != Materials.Rubber)
                     && (aMaterial != Materials._NULL)) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
index 28d0609e93..acef57b368 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
@@ -12,7 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_AlloySmelter extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
index 79a5947d66..0e67ab7ebc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
@@ -14,7 +14,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_Assembler extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index b072f7ee21..e85f8e4f5e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -25,7 +25,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
index a6f19d05fe..a48fa23765 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
@@ -21,8 +21,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_BlastSmelterGT_GTNH {
 
-    private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<String, FluidStack>();
-    private static Map<String, String> mCachedHotToColdRegistry = new HashMap<String, String>();
+    private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>();
+    private static Map<String, String> mCachedHotToColdRegistry = new HashMap<>();
 
     private static synchronized void setIngotToFluid(final ItemStackData stack, final FluidStack fluid) {
         if (stack != null && fluid != null) {
@@ -186,7 +186,7 @@ public class RecipeGen_BlastSmelterGT_GTNH {
                         boolean circuitFound = false;
 
                         // Build correct input stack
-                        ArrayList<ItemStack> aTempList = new ArrayList<ItemStack>();
+                        ArrayList<ItemStack> aTempList = new ArrayList<>();
                         for (ItemStack recipeItem : inputs) {
                             if (ItemUtils.isControlCircuit(recipeItem)) {
                                 circuitFound = true;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index ed8c18ba4b..b30a16f44f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -25,7 +25,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
 
 public class RecipeGen_DustGeneration extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
@@ -338,7 +338,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
     }
 
     public static boolean generatePackagerRecipes(Material aMatInfo) {
-        AutoMap<Boolean> aResults = new AutoMap<Boolean>();
+        AutoMap<Boolean> aResults = new AutoMap<>();
         // Small Dust
         aResults.put(
                 GT_Values.RA.addBoxingRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index d2d54a920c..7ef35b26a0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -15,7 +15,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_Extruder extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
index 561c0884cd..0510037f5d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
@@ -40,7 +40,7 @@ public class RecipeGen_FluidCanning implements Runnable {
 
     private static boolean mHasRun = false;
 
-    private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<RecipeGen_FluidCanning>();
+    private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<>();
 
     private static void addRunnableToRecipeCache(RecipeGen_FluidCanning r) {
         if (mHasRun) {
@@ -144,8 +144,6 @@ public class RecipeGen_FluidCanning implements Runnable {
             recipe = aRecipe;
             disableOptional = aExtracting;
             isValid = true;
-            // Logger.INFO("Passed Validity Check. Hash: "+recipe.hashCode());
-            // Logger.INFO("Mapped as: "+(disableOptional ? "Extracting" : "Canning"));
             addRunnableToRecipeCache(this);
         } else {
             // Logger.INFO("Failed Validity Check.");
@@ -174,7 +172,7 @@ public class RecipeGen_FluidCanning implements Runnable {
         }
     }
 
-    private final boolean addFluidExtractionRecipe(GT_Recipe aRecipe) {
+    private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) {
         boolean result = false;
         CORE.crash();
         Logger.INFO(
@@ -211,7 +209,7 @@ public class RecipeGen_FluidCanning implements Runnable {
         return result;
     }
 
-    private final boolean addFluidCannerRecipe(GT_Recipe aRecipe) {
+    private boolean addFluidCannerRecipe(GT_Recipe aRecipe) {
         boolean result = false;
         int aCount1 = GT_Recipe_Map.sFluidCannerRecipes.mRecipeList.size();
         int aCount2 = aCount1;
@@ -257,7 +255,7 @@ public class RecipeGen_FluidCanning implements Runnable {
                 + " | ";
     }
 
-    private final int getMapSize(GT_Recipe_Map aMap) {
+    private int getMapSize(GT_Recipe_Map aMap) {
         return aMap.mRecipeList.size();
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index fa08380596..0d5c218ab9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -13,7 +13,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_Fluids extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
index d1bcab904c..c8f87d7cb3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
@@ -22,7 +22,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
 
 public class RecipeGen_Fluorite extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 734832807e..11475c1024 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -21,7 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
@@ -57,11 +57,11 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
                     partSizes[hu] = (int) material.vSmallestRatio[hu];
                 }
             }
-            AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>();
+            AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>();
             int alnsnfds = 0;
             for (MaterialStack r : material.getComposites()) {
                 if (r != null) {
-                    componentMap.put(new Pair<Integer, Material>(partSizes[alnsnfds], r.getStackMaterial()));
+                    componentMap.put(new Pair<>(partSizes[alnsnfds], r.getStackMaterial()));
                 }
                 alnsnfds++;
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
index 0464ae80d7..f90c497edb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
@@ -14,7 +14,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_MetalRecipe extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index fdbeea89cf..68799b15d1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -27,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
 
 public class RecipeGen_Ore extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
@@ -73,7 +73,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
         boolean allFailed = false;
 
         // Setup Bonuses
-        ArrayList<Material> aMatComp = new ArrayList<Material>();
+        ArrayList<Material> aMatComp = new ArrayList<>();
         for (Material j : MaterialUtils.getCompoundMaterialsRecursively(material)) {
             aMatComp.add(j);
         }
@@ -84,7 +84,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
             }
         }
 
-        AutoMap<Material> amJ = new AutoMap<Material>();
+        AutoMap<Material> amJ = new AutoMap<>();
         int aIndexCounter = 0;
         for (Material g : aMatComp) {
             if (g.hasSolidForm()) {
@@ -134,10 +134,10 @@ public class RecipeGen_Ore extends RecipeGen_Base {
             bonusB = tVoltageMultiplier > 100 ? material : mStone;
         }
 
-        AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>();
+        AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>();
         for (MaterialStack r : material.getComposites()) {
             if (r != null) {
-                componentMap.put(new Pair<Integer, Material>(r.getPartsPerOneHundred(), r.getStackMaterial()));
+                componentMap.put(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial()));
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
index 22d3e689da..bc27630bcf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
@@ -15,7 +15,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_Plasma extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 9cd6fedbc0..75d7abbba0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -19,7 +19,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_Plates extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index d821751c7b..0087ee07d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -29,7 +29,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class RecipeGen_Recycling implements Runnable {
 
-    public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<Runnable>();
+    public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<>();
 
     public static void executeGenerators() {
         if (mQueuedRecyclingGenerators.size() > 0) {
@@ -80,7 +80,7 @@ public class RecipeGen_Recycling implements Runnable {
                     mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()),
                     1);
             if (temp != null) {
-                mValidPairs[mSlotIndex++] = new Pair<OrePrefixes, ItemStack>(mValidPrefixesAsString[r], temp.copy());
+                mValidPairs[mSlotIndex++] = new Pair<>(mValidPrefixesAsString[r], temp.copy());
             }
         }
 
@@ -218,7 +218,7 @@ public class RecipeGen_Recycling implements Runnable {
 
         if (mPrefix != null && mDust != null) {
             Logger.WARNING("Built valid dust pair.");
-            return new Pair<OrePrefixes, ItemStack>(mPrefix, mDust);
+            return new Pair<>(mPrefix, mDust);
         } else {
             Logger.WARNING("mPrefix: " + (mPrefix != null));
             Logger.WARNING("mDust: " + (mDust != null));
@@ -310,7 +310,7 @@ public class RecipeGen_Recycling implements Runnable {
 
     public static ArrayList<ItemStack> getOres(final Object aOreName) {
         final String aName = (aOreName == null) ? "" : aOreName.toString();
-        final ArrayList<ItemStack> rList = new ArrayList<ItemStack>();
+        final ArrayList<ItemStack> rList = new ArrayList<>();
         if (GT_Utility.isStringValid(aName)) {
             Logger.WARNING("Making a list of all OreDict entries for " + aOreName + ".");
             if (rList.addAll(OreDictionary.getOres(aName))) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index e414d8c511..fed32b5f7d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -12,7 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
 
-    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>();
+    public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
         MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
index 7ca8d4d78e..980bf983ca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
@@ -17,8 +17,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeLoader_AlgaeFarm {
 
-    private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>();
-    private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>();
+    private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<>();
+    private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<>();
 
     public static void generateRecipes() {
         for (int i = 0; i < 10; i++) {
@@ -35,7 +35,7 @@ public class RecipeLoader_AlgaeFarm {
 
         AutoMap<GT_Recipe> aTemp = aMap.get(aTier);
         if (aTemp == null || aTemp.isEmpty()) {
-            aTemp = new AutoMap<GT_Recipe>();
+            aTemp = new AutoMap<>();
             aMap.put(aTier, aTemp);
             Logger.INFO("Tier " + aTier + aComp + " had no recipes, initialising new map.");
         }
@@ -62,7 +62,7 @@ public class RecipeLoader_AlgaeFarm {
             return null;
         }
 
-        WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<Float>();
+        WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<>();
         for (int i = 100; i > 0; i--) {
             float aValue = 0;
             if (i < 10) {
@@ -112,7 +112,7 @@ public class RecipeLoader_AlgaeFarm {
     private static ItemStack[] getOutputsForTier(int aTier) {
 
         // Create an Automap to dump contents into
-        AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>();
+        AutoMap<ItemStack> aOutputMap = new AutoMap<>();
 
         // Add loot relevant to tier and also add any from lower tiers.
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index 9c92f40608..27f289a7c5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -20,12 +20,12 @@ public class RecipeLoader_LFTR {
 
     private static void configureSparging() {
         if (mSpargeGases == null) {
-            mSpargeGases = new AutoMap<Fluid>();
+            mSpargeGases = new AutoMap<>();
             mSpargeGases.add(Materials.Helium.getGas(1).getFluid());
             mSpargeGases.add(Materials.Fluorine.getGas(1).getFluid());
         }
         if (mNobleGases == null) {
-            mNobleGases = new AutoMap<Fluid>();
+            mNobleGases = new AutoMap<>();
             mNobleGases.add(mSpargeGases.get(0));
             mNobleGases.add(ELEMENT.getInstance().XENON.getFluid());
             mNobleGases.add(ELEMENT.getInstance().NEON.getFluid());
@@ -34,7 +34,7 @@ public class RecipeLoader_LFTR {
             mNobleGases.add(ELEMENT.getInstance().RADON.getFluid());
         }
         if (mFluorideGases == null) {
-            mFluorideGases = new AutoMap<Fluid>();
+            mFluorideGases = new AutoMap<>();
             mFluorideGases.add(mSpargeGases.get(1));
             mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid());
             mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
index c31500d084..8b59e2d232 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
@@ -18,8 +18,7 @@ public class RecipeLoader_MolecularTransformer {
 
     public static void run() {
 
-        for (int i = 0; i < transformerRecipes.size(); i++) {
-            MTRecipeRecord aRecipe = transformerRecipes.get(i);
+        for (MTRecipeRecord aRecipe : transformerRecipes) {
             int aEU = MaterialUtils.getVoltageForTier(5);
             Logger.INFO("=======================");
             Logger.INFO("Generating GT recipe for Molecular Transformer.");