Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

3 files changed, 25 insertions, 26 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
index 9e2e29a7fc..948a918071 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
@@ -91,47 +91,47 @@ public class GregtechBufferDynamos {
             GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ULV, 'T', CI.getTieredCircuit(0), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.Lead) });
+                OrePrefixes.cableGt04.get(Materials.Lead) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LV, 'T', CI.getTieredCircuit(1), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.Tin) });
+                OrePrefixes.cableGt04.get(Materials.Tin) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MV, 'T', CI.getTieredCircuit(2), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) });
+                OrePrefixes.cableGt04.get(Materials.AnyCopper) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_HV, 'T', CI.getTieredCircuit(3), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.Gold) });
+                OrePrefixes.cableGt04.get(Materials.Gold) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_EV, 'T', CI.getTieredCircuit(4), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.Aluminium) });
+                OrePrefixes.cableGt04.get(Materials.Aluminium) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_IV, 'T', CI.getTieredCircuit(5), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.Tungsten) });
+                OrePrefixes.cableGt04.get(Materials.Tungsten) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LuV, 'T', CI.getTieredCircuit(6), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) });
+                OrePrefixes.cableGt04.get(Materials.VanadiumGallium) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ZPM, 'T', CI.getTieredCircuit(7), 'C',
-                OrePrefixes.cableGt04.get((Object) Materials.Naquadah) });
+                OrePrefixes.cableGt04.get(Materials.Naquadah) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L),
             bitsd,
             new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UV, 'T', CI.getTieredCircuit(8), 'C',
-                OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) });
+                OrePrefixes.wireGt12.get(Materials.NaquadahAlloy) });
         GTModHandler.addCraftingRecipe(
             GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L),
             bitsd,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index b331479028..c65d4109ee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -743,23 +743,23 @@ public class GregtechConduits {
         Logger.WARNING(
             "Generated pipeTiny from " + materialName
                 + "? "
-                + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null) ? true : false));
+                + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null));
         Logger.WARNING(
             "Generated pipeSmall from " + materialName
                 + "? "
-                + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null) ? true : false));
+                + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null));
         Logger.WARNING(
             "Generated pipeNormal from " + materialName
                 + "? "
-                + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null) ? true : false));
+                + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null));
         Logger.WARNING(
             "Generated pipeLarge from " + materialName
                 + "? "
-                + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null) ? true : false));
+                + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null));
         Logger.WARNING(
             "Generated pipeHuge from " + materialName
                 + "? "
-                + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true : false));
+                + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null));
 
         int eut = (int) (8 * vMulti);
 
@@ -877,8 +877,7 @@ public class GregtechConduits {
         String tName = aName.toString();
         if (GTUtility.isStringInvalid(tName)) return false;
         ArrayList<ItemStack> tList = GTOreDictUnificator.getOres(tName);
-        for (ItemStack itemStack : tList)
-            if (GTUtility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false;
+        for (ItemStack itemStack : tList) if (GTUtility.areStacksEqual(itemStack, aStack, true)) return false;
         OreDictionary.registerOre(tName, GTUtility.copyAmount(1L, new Object[] { aStack }));
         return true;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 6dd9c7170c..a6c3b51673 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -110,70 +110,70 @@ public class GregtechEnergyBuffer {
                 1).getStackForm(1L));
 
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_ULV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt08.get(Materials.Lead), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_LV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt08.get(Materials.Tin), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_MV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_HV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt08.get(Materials.Gold), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_EV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt08.get(Materials.Aluminium), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_IV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt08.get(Materials.Tungsten), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_LuV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_UV.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,
             new Object[] { "WTW", "WMW", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T',
                 GregtechOreDictNames.buffer_core });
         GTModHandler.addCraftingRecipe(
-            GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
+            GregtechItemList.Energy_Buffer_1by1_MAX.get(1L),
             GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE
                 | GTModHandler.RecipeBits.REVERSIBLE
                 | GTModHandler.RecipeBits.BUFFERED,