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>

9 files changed, 59 insertions, 76 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
index 4eb1b553c1..890a9020c9 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
@@ -32,26 +32,18 @@ public enum AlgaeDefinition {
     }
 
     public static AlgaeDefinition getByIndex(int aIndex) {
-        switch (aIndex) {
-            default:
-            case 0:
-                return Euglenophyta;
-            case 1:
-                return Chrysophyta;
-            case 2:
-                return Pyrrophyta;
-            case 3:
-                return Chlorophyta;
-            case 4:
-                return Rhodophyta;
-            case 5:
-                return Paeophyta;
-            case 6:
-                return Xanthophyta;
-        }
+        return switch (aIndex) {
+            default -> Euglenophyta;
+            case 1 -> Chrysophyta;
+            case 2 -> Pyrrophyta;
+            case 3 -> Chlorophyta;
+            case 4 -> Rhodophyta;
+            case 5 -> Paeophyta;
+            case 6 -> Xanthophyta;
+        };
     }
 
-    private static final int getRGB(int r, int g, int b) {
+    private static int getRGB(int r, int g, int b) {
         return AlgaeUtils.rgbtoHexValue(r, g, b);
     }
 }
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index f3125325ed..7194921650 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -96,23 +96,23 @@ public class BioRecipes {
     private static Fluid mButanol;
     private static Fluid mAcetone;
 
-    private static final ItemStack getGreenAlgaeRecipeChip() {
+    private static ItemStack getGreenAlgaeRecipeChip() {
         return getBioChip(4);
     }
 
-    private static final ItemStack getBrownAlgaeRecipeChip() {
+    private static ItemStack getBrownAlgaeRecipeChip() {
         return getBioChip(8);
     }
 
-    private static final ItemStack getGoldenBrownAlgaeRecipeChip() {
+    private static ItemStack getGoldenBrownAlgaeRecipeChip() {
         return getBioChip(12);
     }
 
-    private static final ItemStack getRedAlgaeRecipeChip() {
+    private static ItemStack getRedAlgaeRecipeChip() {
         return getBioChip(16);
     }
 
-    private static final ItemStack getBioChip(int aID) {
+    private static ItemStack getBioChip(int aID) {
         return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, aID, 0);
     }
 
@@ -126,7 +126,7 @@ public class BioRecipes {
         Logger.INFO("[Bio] Finished with recipes");
     }
 
-    private static final void initRecipeVars() {
+    private static void initRecipeVars() {
         mFert = AgriculturalChem.dustOrganicFertilizer;
         mDustDirt = AgriculturalChem.dustDirt;
 
@@ -454,13 +454,13 @@ public class BioRecipes {
                 16);
     }
 
-    public static final HashSet<GT_ItemStack> mFruits = new HashSet<GT_ItemStack>();
-    public static final HashSet<GT_ItemStack> mVege = new HashSet<GT_ItemStack>();
-    public static final HashSet<GT_ItemStack> mNuts = new HashSet<GT_ItemStack>();
-    public static final HashSet<GT_ItemStack> mSeeds = new HashSet<GT_ItemStack>();
+    public static final HashSet<GT_ItemStack> mFruits = new HashSet<>();
+    public static final HashSet<GT_ItemStack> mVege = new HashSet<>();
+    public static final HashSet<GT_ItemStack> mNuts = new HashSet<>();
+    public static final HashSet<GT_ItemStack> mSeeds = new HashSet<>();
 
-    public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
-    public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+    public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<>();
+    public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<>();
 
     private static void processFermentationOreDict() {
         processOreDictEntry("listAllfruit", mFruits);
@@ -689,7 +689,7 @@ public class BioRecipes {
     private static void recipeAluminiumPellet() {
 
         // Ore Names, no prefix
-        AutoMap<String> aOreNames = new AutoMap<String>();
+        AutoMap<String> aOreNames = new AutoMap<>();
 
         aOreNames.put("Lazurite");
         aOreNames.put("Bauxite");
@@ -702,11 +702,11 @@ public class BioRecipes {
         aOreNames.put("GreenSapphire");
 
         // Voltage
-        HashMap<String, Integer> aOreData1 = new HashMap<String, Integer>();
+        HashMap<String, Integer> aOreData1 = new HashMap<>();
         // Input Count
-        HashMap<String, Integer> aOreData2 = new HashMap<String, Integer>();
+        HashMap<String, Integer> aOreData2 = new HashMap<>();
         // Output Count
-        HashMap<String, Integer> aOreData3 = new HashMap<String, Integer>();
+        HashMap<String, Integer> aOreData3 = new HashMap<>();
 
         aOreData1.put("Lazurite", 120);
         aOreData1.put("Bauxite", 90);
@@ -737,7 +737,7 @@ public class BioRecipes {
         aOreData3.put("GreenSapphire", 2);
 
         // Assemble all valid crushed ore types for making pellet mix
-        HashMap<String, ItemStack> aOreCache = new HashMap<String, ItemStack>();
+        HashMap<String, ItemStack> aOreCache = new HashMap<>();
         for (String aOreName : aOreNames) {
             String aTemp = aOreName;
             aOreName = "crushedPurified" + aOreName;
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
index 22f1ef0b34..8ce137a323 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
@@ -6,7 +6,7 @@ import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
 
 public interface IAlgalItem {
 
-    public abstract AlgaeDefinition getAlgaeType(ItemStack aStack);
+    AlgaeDefinition getAlgaeType(ItemStack aStack);
 
-    public abstract AlgaeGeneticData getSpeciesData(ItemStack aStack);
+    AlgaeGeneticData getSpeciesData(ItemStack aStack);
 }
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
index 0fab6a2c96..7b1fb2b148 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
@@ -22,7 +22,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.plugin.agrichem.AlgaeDefinition;
 import gtPlusPlus.plugin.agrichem.IAlgalItem;
 import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
-import gtPlusPlus.plugin.agrichem.logic.AlgaeGrowthRequirement;
 
 public class ItemAlgaeBase extends Item implements IAlgalItem {
 
@@ -211,7 +210,7 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
                         aSpeed,
                         aLifespan,
                         0,
-                        new AutoMap<AlgaeGrowthRequirement>());
+                        new AutoMap<>());
                 aTag = aGenes.writeToNBT();
             }
         } else {
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
index c59076f01d..c11877b672 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
@@ -27,7 +27,7 @@ public class AlgaeGeneticData {
     private final AutoMap<AlgaeGrowthRequirement> mSpecialRequirements;
 
     public AlgaeGeneticData() {
-        this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<AlgaeGrowthRequirement>());
+        this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<>());
     }
 
     public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh,
@@ -67,7 +67,7 @@ public class AlgaeGeneticData {
             mLifespan = aNBT.getByte("mLifespan");
             mGeneration = aNBT.getInteger("mGeneration");
         }
-        mSpecialRequirements = new AutoMap<AlgaeGrowthRequirement>();
+        mSpecialRequirements = new AutoMap<>();
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java
index 4d87a746f3..b35ad2c063 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java
@@ -2,5 +2,5 @@ package gtPlusPlus.plugin.fixes.interfaces;
 
 public interface IBugFix {
 
-    public boolean isFixValid();
+    boolean isFixValid();
 }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index f4c4df492e..2fa92951c7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -13,7 +13,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
-import gtPlusPlus.preloader.DevHelper;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class VanillaBedHeightFix implements IBugFix {
 
@@ -22,25 +22,21 @@ public class VanillaBedHeightFix implements IBugFix {
 
     public VanillaBedHeightFix(IPlugin minstance) {
         mParent = minstance;
-        if (DevHelper.isValidHelperObject()) {
-            Method m;
-            if (DevHelper.isObfuscatedEnvironment()) {
-                m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
-            } else {
-                m = ReflectionUtils.getMethod(
-                        net.minecraft.entity.player.EntityPlayer.class,
-                        "sleepInBedAt",
-                        int.class,
-                        int.class,
-                        int.class);
-            }
-            if (m != null) {
-                mSleepInBedAt = m;
-                mParent.log("Registering Bed Height Fix.");
-                Utils.registerEvent(this);
-            } else {
-                mSleepInBedAt = null;
-            }
+        Method m;
+        if (!CORE_Preloader.DEV_ENVIRONMENT) {
+            m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
+        } else {
+            m = ReflectionUtils.getMethod(
+                    net.minecraft.entity.player.EntityPlayer.class,
+                    "sleepInBedAt",
+                    int.class,
+                    int.class,
+                    int.class);
+        }
+        if (m != null) {
+            mSleepInBedAt = m;
+            mParent.log("Registering Bed Height Fix.");
+            Utils.registerEvent(this);
         } else {
             mSleepInBedAt = null;
         }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
index 98657b455f..ed1d9890d7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
@@ -62,13 +62,13 @@ public class MusicTocker extends MusicTicker implements Runnable {
         return false;
     }
 
-    private final void updateInternalNumber() {
+    private void updateInternalNumber() {
         if (ReflectionUtils.doesFieldExist(getClass(), "field_147676_d")) {
             ReflectionUtils.setField(this, "field_147676_d", mTimeUntilNextTrack);
         }
     }
 
-    private final void updateInternalSound(ISound aSound) {
+    private void updateInternalSound(ISound aSound) {
         if (ReflectionUtils.doesFieldExist(getClass(), "field_147678_c")) {
             ReflectionUtils.setField(this, "field_147678_c", aSound);
         }
diff --git a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java
index 72ec918d37..be1dafd231 100644
--- a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java
+++ b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java
@@ -7,7 +7,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class Core_Manager {
 
-    public static AutoMap<IPlugin> mPlugins = new AutoMap<IPlugin>();
+    public static AutoMap<IPlugin> mPlugins = new AutoMap<>();
 
     /**
      * @param plugin - Dynamically registers the plugin for loading.
@@ -36,7 +36,7 @@ public class Core_Manager {
                 }
             }
             return true;
-        } catch (Throwable t) {}
+        } catch (Throwable ignored) {}
         return false;
     }
 
@@ -50,7 +50,7 @@ public class Core_Manager {
                 }
             }
             return true;
-        } catch (Throwable t) {}
+        } catch (Throwable ignored) {}
         return false;
     }
 
@@ -64,11 +64,11 @@ public class Core_Manager {
                 }
             }
             return true;
-        } catch (Throwable t) {}
+        } catch (Throwable ignored) {}
         return false;
     }
 
-    public static boolean serverStart() {
+    public static void serverStart() {
         try {
             for (IPlugin h : mPlugins) {
                 if (h.serverStart()) {
@@ -77,12 +77,10 @@ public class Core_Manager {
                     Logger.INFO("[Plugin] Failed during Server Start Phase for " + h.getPluginName() + ".");
                 }
             }
-            return true;
-        } catch (Throwable t) {}
-        return false;
+        } catch (Throwable ignored) {}
     }
 
-    public static boolean serverStop() {
+    public static void serverStop() {
         try {
             for (IPlugin h : mPlugins) {
                 if (h.serverStop()) {
@@ -91,8 +89,6 @@ public class Core_Manager {
                     Logger.INFO("[Plugin] Failed during Server Stop Phase for " + h.getPluginName() + ".");
                 }
             }
-            return true;
-        } catch (Throwable t) {}
-        return false;
+        } catch (Throwable ignored) {}
     }
 }