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>

7 files changed, 13 insertions, 188 deletions

diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
index 601f91b3e9..2e08493d0d 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
@@ -8,19 +8,11 @@ import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
 
 public class Gui_ID_Registry {
 
-    private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>();
-    private static final Map<Integer, MU_GuiId> idMap = new HashMap<Integer, MU_GuiId>();
+    private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<>();
+    private static final Map<Integer, MU_GuiId> idMap = new HashMap<>();
     private static int nextId = 0;
 
-    static {
-        // registerGuiHandlers(Gui_Types.Tile, Arrays.asList(new Class[] {TileAlveary.class}));
-        // registerGuiHandlers(MU_GuiType.Item, Arrays.asList(new Class[] { ItemBackpack.class,
-        // ItemBackpackNaturalist.class, ItemBeealyzer.class, ItemCatalogue.class, ItemFlutterlyzer.class,
-        // ItemHabitatLocator.class, ItemImprinter.class, ItemInfuser.class, ItemLetter.class, ItemSolderingIron.class,
-        // ItemTreealyzer.class }));
-        // registerGuiHandlers(MU_GuiType.Entity, Arrays.asList(new Class[] { EntityMinecartApiary.class,
-        // EntityMinecartBeehouse.class }));
-    }
+    static {}
 
     private static void registerGuiHandlers(final Gui_Types MU_GuiType,
             final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) {
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java
index 19d912b30f..eb019b500f 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java
@@ -26,9 +26,6 @@ public class GUI_DecayablesChest extends GuiContainer {
 
     @Override
     protected void drawGuiContainerForegroundLayer(final int i, final int j) {
-        // this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
-        // this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2,
-        // 4210752);
 
     }
 
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
index f4a3c628de..db8019a93a 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
@@ -27,9 +27,6 @@ public class GUI_ProjectTable extends GuiContainer {
 
     @Override
     protected void drawGuiContainerForegroundLayer(final int i, final int j) {
-        // this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
-        // this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2,
-        // 4210752);
 
     }
 
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
deleted file mode 100644
index 40e4eafe7f..0000000000
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package gtPlusPlus.core.gui.machine;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.lang.reflect.Method;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_RoundRobinator;
-import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-
-@SideOnly(Side.CLIENT)
-public class GUI_RoundRobinator extends GuiContainer {
-
-    private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
-            GTPlusPlus.ID,
-            "textures/gui/RoundRobinator.png");
-    private TileEntityRoundRobinator mTile;
-    private Container_RoundRobinator mContainer;
-    private static final Method mDrawItemStack;
-
-    static {
-        mDrawItemStack = ReflectionUtils.getMethod(
-                GuiContainer.class,
-                "drawItemStack",
-                new Class[] { ItemStack.class, int.class, int.class, String.class });
-    }
-
-    public GUI_RoundRobinator(final InventoryPlayer player_inventory, final TileEntityRoundRobinator te) {
-        this(new Container_RoundRobinator(player_inventory, te));
-        mTile = te;
-    }
-
-    private GUI_RoundRobinator(final Container_RoundRobinator aContainer) {
-        super(aContainer);
-        mContainer = aContainer;
-    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer(final int i, final int j) {
-        super.drawGuiContainerForegroundLayer(i, j);
-
-        int xStart = 134;
-        int yStart = 31;
-        mTile = this.mContainer.tile_entity;
-
-        int tier = mContainer.mTier;
-        int aTickRate = mContainer.mTickRate;
-
-        fontRendererObj.drawString("Round Robinator", 85, 4, Utils.rgbtoHexValue(50, 150, 50));
-        fontRendererObj.drawString("Tier: " + tier, 85, 12, Utils.rgbtoHexValue(50, 150, 50));
-        fontRendererObj.drawString("Rate: 1 Item/" + aTickRate + "t", 85, 20, Utils.rgbtoHexValue(50, 150, 50));
-
-        boolean[] aStates = new boolean[] { mContainer.mSide_1 == 0 ? false : true,
-                mContainer.mSide_2 == 0 ? false : true, mContainer.mSide_3 == 0 ? false : true,
-                mContainer.mSide_4 == 0 ? false : true };
-
-        fontRendererObj
-                .drawString("West: " + (aStates[0] ? "Active" : "Disabled"), 5, 5, Utils.rgbtoHexValue(50, 50, 50));
-        fontRendererObj
-                .drawString("North: " + (aStates[1] ? "Active" : "Disabled"), 5, 15, Utils.rgbtoHexValue(50, 50, 50));
-        fontRendererObj
-                .drawString("South: " + (aStates[2] ? "Active" : "Disabled"), 5, 25, Utils.rgbtoHexValue(50, 50, 50));
-        fontRendererObj
-                .drawString("East: " + (aStates[3] ? "Active" : "Disabled"), 5, 35, Utils.rgbtoHexValue(50, 50, 50));
-        fontRendererObj.drawString("Toggling South will visually", 5, 65, Utils.rgbtoHexValue(150, 50, 50));
-        fontRendererObj.drawString("toggle East, This is a visual bug.", 5, 74, Utils.rgbtoHexValue(150, 50, 50));
-        drawStatus(aStates[0], xStart, yStart);
-        drawStatus(aStates[1], xStart + 18, yStart);
-        drawStatus(aStates[2], xStart, yStart + 18);
-        drawStatus(aStates[3], xStart + 18, yStart + 18);
-    }
-
-    @Override
-    protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j) {
-        GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-        this.mc.renderEngine.bindTexture(craftingTableGuiTextures);
-        final int x = (this.width - this.xSize) / 2;
-        final int y = (this.height - this.ySize) / 2;
-        this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
-    }
-
-    private static ItemStack aGreenGlass;
-    private static ItemStack aRedGlass;
-
-    private void drawStatus(boolean aStateActive, int x, int y) {
-        if (aGreenGlass == null) {
-            Item pane = ItemUtils.getSimpleStack(Blocks.stained_glass_pane).getItem();
-            aGreenGlass = ItemUtils.simpleMetaStack(pane, 5, 1);
-        }
-        if (aRedGlass == null) {
-            Item pane = ItemUtils.getSimpleStack(Blocks.stained_glass_pane).getItem();
-            aRedGlass = ItemUtils.simpleMetaStack(pane, 14, 1);
-        }
-        if (mDrawItemStack != null) {
-            try {
-                if (aStateActive) {
-                    mDrawItemStack.invoke(this, new Object[] { aGreenGlass, x, y, "" });
-                } else {
-                    mDrawItemStack.invoke(this, new Object[] { aRedGlass, x, y, "" });
-                }
-            } catch (Throwable t) {
-                t.printStackTrace();
-            }
-        }
-    }
-
-    // This method is called when the Gui is first called!
-    @Override
-    public void initGui() {
-        super.initGui();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
index 598cfd61ef..e453c61641 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
@@ -60,7 +60,7 @@ public class GUI_SuperJukebox extends GUI_Base_Tile_Entity {
         final int yStart = (this.height - this.ySize) / 2;
         final int x3 = x2 - xStart;
         final int y3 = y2 - yStart + 5;
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
 
         if (y3 >= 17 && y3 <= 33) {
             if (x3 >= 80 && x3 <= 96) {
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
index ce0a05adc4..d3b30c87c1 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
@@ -96,18 +96,10 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer {
             log("Found Digit: " + c + " | char value");
         } else {
             switch (c) {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
+                case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' -> {
                     log("Found Digit: " + c + " | char switch");
                     return true;
+                }
             }
         }
         return isNum;
@@ -115,28 +107,10 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer {
 
     public boolean isNumber(int c) {
         switch (c) {
-            case Keyboard.KEY_0:
-            case Keyboard.KEY_1:
-            case Keyboard.KEY_2:
-            case Keyboard.KEY_3:
-            case Keyboard.KEY_4:
-            case Keyboard.KEY_5:
-            case Keyboard.KEY_6:
-            case Keyboard.KEY_7:
-            case Keyboard.KEY_8:
-            case Keyboard.KEY_9:
-            case Keyboard.KEY_NUMPAD0:
-            case Keyboard.KEY_NUMPAD1:
-            case Keyboard.KEY_NUMPAD2:
-            case Keyboard.KEY_NUMPAD3:
-            case Keyboard.KEY_NUMPAD4:
-            case Keyboard.KEY_NUMPAD5:
-            case Keyboard.KEY_NUMPAD6:
-            case Keyboard.KEY_NUMPAD7:
-            case Keyboard.KEY_NUMPAD8:
-            case Keyboard.KEY_NUMPAD9:
+            case Keyboard.KEY_0, Keyboard.KEY_1, Keyboard.KEY_2, Keyboard.KEY_3, Keyboard.KEY_4, Keyboard.KEY_5, Keyboard.KEY_6, Keyboard.KEY_7, Keyboard.KEY_8, Keyboard.KEY_9, Keyboard.KEY_NUMPAD0, Keyboard.KEY_NUMPAD1, Keyboard.KEY_NUMPAD2, Keyboard.KEY_NUMPAD3, Keyboard.KEY_NUMPAD4, Keyboard.KEY_NUMPAD5, Keyboard.KEY_NUMPAD6, Keyboard.KEY_NUMPAD7, Keyboard.KEY_NUMPAD8, Keyboard.KEY_NUMPAD9 -> {
                 log("Found Digit: " + Keyboard.getKeyName(c) + " | LWJGL Keybinding");
                 return true;
+            }
         }
         return false;
     }
diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
index ebd33600d3..5e6973ab2a 100644
--- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
+++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
@@ -7,7 +7,7 @@ import net.minecraft.client.gui.GuiTextField;
 
 import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.DevHelper;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class GuiValueField extends GuiTextField {
 
@@ -25,15 +25,6 @@ public class GuiValueField extends GuiTextField {
         mGUI = aGUI;
     }
 
-    public boolean canLoseFocus() {
-        Field canLoseFocus = ReflectionUtils
-                .getField(GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146212_n" : "canLoseFocus");
-        if (canLoseFocus != null) {
-            return (boolean) ReflectionUtils.getFieldValue(canLoseFocus, this);
-        }
-        return true;
-    }
-
     @Override
     public boolean isFocused() {
         return super.isFocused();
@@ -42,17 +33,16 @@ public class GuiValueField extends GuiTextField {
     public boolean isBackgroundDrawingEnabled() {
         Field enableBackgroundDrawing = ReflectionUtils.getField(
                 GuiTextField.class,
-                DevHelper.isObfuscatedEnvironment() ? "field_146215_m" : "enableBackgroundDrawing");
+                !CORE_Preloader.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing");
         if (enableBackgroundDrawing != null) {
-            return (boolean) ReflectionUtils.getFieldValue(enableBackgroundDrawing, this);
+            return ReflectionUtils.getFieldValue(enableBackgroundDrawing, this);
         }
         return true;
     }
 
     public int getLineScrollOffset() {
-        Field lineScrollOffset = ReflectionUtils.getField(
-                GuiTextField.class,
-                DevHelper.isObfuscatedEnvironment() ? "field_146225_q" : "lineScrollOffset");
+        Field lineScrollOffset = ReflectionUtils
+                .getField(GuiTextField.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset");
         if (lineScrollOffset != null) {
             return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this);
         }