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>

2 files changed, 23 insertions, 75 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 90fd1e2358..ed2bc20c32 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -53,18 +53,7 @@ public enum GregtechItemList implements GregtechItemContainer {
     Sensor_ZPM,
     Sensor_UV,
 
-    // ULV Components
-    Electric_Motor_ULV,
-    Electric_Pump_ULV,
-    Conveyor_Module_ULV,
-    Electric_Piston_ULV,
-    Robot_Arm_ULV,
-    Field_Generator_ULV,
-    Emitter_ULV,
-    Sensor_ULV,
-
     // Mixed Components
-    TransmissionComponent_ULV,
     TransmissionComponent_LV,
     TransmissionComponent_MV,
     TransmissionComponent_HV,
@@ -73,7 +62,7 @@ public enum GregtechItemList implements GregtechItemContainer {
     TransmissionComponent_LuV,
     TransmissionComponent_ZPM,
     TransmissionComponent_UV,
-    TransmissionComponent_MAX,
+    TransmissionComponent_UHV,
 
     // Recipe Circuit
     Circuit_BioRecipeSelector,
@@ -176,13 +165,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     Laser_Lens_WoodsGlass,
     Laser_Lens_Special,
 
-    // Bombs
-    Bomb_Cast,
-    Bomb_Cast_Molten,
-    Bomb_Cast_Set,
-    Bomb_Cast_Broken,
-    Bomb_Cast_Mold,
-
     // Pellet Mold
     Pellet_Mold,
 
@@ -210,7 +192,7 @@ public enum GregtechItemList implements GregtechItemContainer {
     GTPP_Casing_LuV,
     GTPP_Casing_ZPM,
     GTPP_Casing_UV,
-    GTPP_Casing_MAX,
+    GTPP_Casing_UHV,
 
     // IronBlastFurnace Machine_Bronze_BlastFurnace
     Casing_IronPlatedBricks,
@@ -552,7 +534,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     Hatch_Muffler_Adv_MAX,
 
     // Super Input Busses
-    Hatch_SuperBus_Input_ULV,
     Hatch_SuperBus_Input_LV,
     Hatch_SuperBus_Input_MV,
     Hatch_SuperBus_Input_HV,
@@ -564,7 +545,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     Hatch_SuperBus_Input_MAX,
 
     // Super Output Busses
-    Hatch_SuperBus_Output_ULV,
     Hatch_SuperBus_Output_LV,
     Hatch_SuperBus_Output_MV,
     Hatch_SuperBus_Output_HV,
@@ -576,10 +556,9 @@ public enum GregtechItemList implements GregtechItemContainer {
     Hatch_SuperBus_Output_MAX,
 
     // Chisel Buses for Industrial Chisel
-    GT_MetaTileEntity_ChiselBus_I,
-    GT_MetaTileEntity_ChiselBus_II,
-    GT_MetaTileEntity_ChiselBus_III,
-    GT_MetaTileEntity_ChiselBus_IV,
+    GT_MetaTileEntity_ChiselBus_LV,
+    GT_MetaTileEntity_ChiselBus_MV,
+    GT_MetaTileEntity_ChiselBus_HV,
 
     // ----------------------------------------------------------------------------
 
@@ -602,11 +581,6 @@ public enum GregtechItemList implements GregtechItemContainer {
      * Single Block Tile Entities
      */
 
-    // ULV Generators
-    Generator_Diesel_ULV,
-    Generator_Gas_Turbine_ULV,
-    Generator_Steam_Turbine_ULV,
-
     // Crate Box
     CrateStorage,
 
@@ -616,17 +590,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     // infinite Items
     Infinite_Item_Chest,
 
-    // GT4 Redstone
-    GT4_Redstone_Lamp,
-    GT4_Redstone_Button_Panel,
-    GT4_Redstone_Scale,
-    GT4_Redstone_Display,
-    GT4_Redstone_Circuit,
-
-    // Gt4 Workbenches
-    GT4_Workbench_Bronze,
-    GT4_Workbench_Advanced,
-
     // GT4 automation
     GT4_Electric_Auto_Workbench_LV,
     GT4_Electric_Auto_Workbench_MV,
@@ -671,7 +634,6 @@ public enum GregtechItemList implements GregtechItemContainer {
 
     // Fancy Pollution Devices
     Pollution_Detector,
-    Pollution_Cleaner_ULV,
     Pollution_Cleaner_LV,
     Pollution_Cleaner_MV,
     Pollution_Cleaner_HV,
@@ -702,11 +664,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     Super_Chest_EV,
     Super_Chest_IV,
 
-    // Chunkloader
-    GT_Chunkloader_HV,
-    GT_Chunkloader_ZPM,
-    GT_Chunkloader_IV,
-
     // Wireless Chargers
     Charger_LV,
     Charger_MV,
@@ -716,7 +673,7 @@ public enum GregtechItemList implements GregtechItemContainer {
     Charger_LuV,
     Charger_ZPM,
     Charger_UV,
-    Charger_MAX,
+    Charger_UHV,
 
     // Reactor Processing Unit
     ReactorProcessingUnit_IV,
@@ -752,21 +709,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     Energy_Buffer_1by1_UV,
     Energy_Buffer_1by1_MAX,
 
-    // Cobble Generators
-    Cobble_Generator_ULV,
-    Cobble_Generator_LV,
-    Cobble_Generator_MV,
-    Cobble_Generator_HV,
-    Cobble_Generator_EV,
-    Cobble_Generator_IV,
-    Cobble_Generator_LuV,
-    Cobble_Generator_ZPM,
-    Cobble_Generator_UV,
-    Cobble_Generator_MAX,
-
-    // The max Steam condenser
-    Condensor_MAX,
-
     // Rocket Engines
     Rocket_Engine_EV,
     Rocket_Engine_IV,
@@ -856,7 +798,6 @@ public enum GregtechItemList implements GregtechItemContainer {
      */
 
     // Fluid Void Covers
-    Cover_Overflow_ULV,
     Cover_Overflow_LV,
     Cover_Overflow_MV,
     Cover_Overflow_HV,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 61abc48a18..03ec5f3fc5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -109,7 +109,7 @@ public enum GregtechOrePrefixes {
     chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced
     ;
 
-    public static volatile int VERSION = 508;
+    public static final int VERSION = 508;
 
     static {
         ingotHot.mHeatDamage = 3.0F;
@@ -132,11 +132,11 @@ public enum GregtechOrePrefixes {
             mGeneratedItems = new HashSet<>();
     private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>();
     private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>();
-    public ItemStack mContainerItem = null;
-    public ICondition<ISubTagContainer> mCondition = null;
+    public final ItemStack mContainerItem = null;
+    public final ICondition<ISubTagContainer> mCondition = null;
     public byte mDefaultStackSize = 64;
-    public GregtechMaterialStack mSecondaryMaterial = null;
-    public GregtechOrePrefixes mPrefixInto = this;
+    public final GregtechMaterialStack mSecondaryMaterial = null;
+    public final GregtechOrePrefixes mPrefixInto = this;
     public float mHeatDamage = 0.0F; // Negative for Frost Damage
     /**
      * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check.
@@ -657,15 +657,22 @@ public enum GregtechOrePrefixes {
                 mOreMultiplier = 1, mByProductMultiplier = 1, mSmeltingMultiplier = 1;
         public long mDensity = M;
         public Element mElement = null;
-        public GT_Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this,
-                mArcSmeltInto = this, mHandleMaterial = this;
+        public GT_Materials mDirectSmelting = this;
+        public GT_Materials mOreReplacement = this;
+        public GT_Materials mMacerateInto = this;
+        public GT_Materials mSmeltInto = this;
+        public GT_Materials mArcSmeltInto = this;
+        public final GT_Materials mHandleMaterial = this;
         public byte mToolQuality = 0;
-        public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null;
+        public final Fluid mSolid = null;
+        public Fluid mFluid = null;
+        public Fluid mGas = null;
+        public Fluid mPlasma = null;
         /**
          * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one
          * Material Unit worth
          */
-        public Fluid mStandardMoltenFluid = null;
+        public final Fluid mStandardMoltenFluid = null;
 
         private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
                 final int aToolDurability, final int aToolQuality, final boolean aUnificatable) {
@@ -1283,6 +1290,6 @@ public enum GregtechOrePrefixes {
             return this.mRGBa;
         }
 
-        public static volatile int VERSION = 508;
+        public static final int VERSION = 508;
     }
 }