Remove more reflection + reorganize mixin accessors packages (#3260)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

6 files changed, 6 insertions, 81 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/AgrichemCore.java b/src/main/java/gtPlusPlus/plugin/agrichem/AgrichemCore.java
deleted file mode 100644
index 6e5cc47e3a..0000000000
--- a/src/main/java/gtPlusPlus/plugin/agrichem/AgrichemCore.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package gtPlusPlus.plugin.agrichem;
-
-import gtPlusPlus.api.interfaces.IPlugin;
-import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
-import gtPlusPlus.plugin.manager.CoreManager;
-
-// Called by Core_Manager#veryEarlyInit
-@SuppressWarnings("unused")
-public class AgrichemCore implements IPlugin {
-
-    static final AgrichemCore mInstance;
-
-    static {
-        mInstance = new AgrichemCore();
-        CoreManager.registerPlugin(mInstance);
-        mInstance.log("Preparing " + mInstance.getPluginName() + " for use.");
-    }
-
-    @Override
-    public boolean preInit() {
-        AgrichemFluids.init();
-        return true;
-    }
-
-    @Override
-    public boolean init() {
-        mInstance.log("Setting Items");
-        return true;
-    }
-
-    @Override
-    public boolean postInit() {
-        mInstance.log("Generating Recipes");
-        return true;
-    }
-
-    @Override
-    public boolean serverStart() {
-        return true;
-    }
-
-    @Override
-    public boolean serverStop() {
-        return true;
-    }
-
-    @Override
-    public String getPluginName() {
-        return "GT++ Agrichemistry Module";
-    }
-
-    @Override
-    public String getPluginAbbreviation() {
-        return "FARM";
-    }
-}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
index bd72654f0a..aa5b22f8fe 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
@@ -22,7 +22,7 @@ public class AgrichemFluids {
     public static Fluid mAcetone;
     public static Fluid mButanol;
 
-    public static void init() {
+    public static void preInit() {
         if (!FluidRegistry.isFluidRegistered("aceticacid")) {
             mAceticAcid = FluidUtils
                 .generateFluidNoPrefix("aceticacid", "Acetic Acid", 200, new short[] { 97, 168, 96, 100 }, true);
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
index b7784580fd..379aed4dcf 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.util.minecraft.OreDictUtils;
 
 public class ItemAgrichemBase extends Item {
 
-    protected final IIcon base[];
+    protected final IIcon[] base;
 
     /*
      * 0 - Algae Biomass 1 - Green Algae Biomass 2 - Brown Algae Biomass 3 - Golden-Brown Algae Biomass 4 - Red Algae
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 ac38b78936..213ee6b47e 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
@@ -2,7 +2,6 @@ package gtPlusPlus.plugin.agrichem.item.algae;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -188,11 +187,9 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
         NBTTagCompound aTag;
         if (!aStack.hasTagCompound() || aStack.getTagCompound()
             .hasNoTags()) {
-            aTag = new NBTTagCompound();
             AlgaeGeneticData aGenes;
             if (aStack.getItemDamage() < 3 || aStack.getItemDamage() > 5) {
                 aGenes = new AlgaeGeneticData();
-                aTag = aGenes.writeToNBT();
             } else {
                 byte aTemp, aLifespan;
                 float aFert, aSpeed;
@@ -212,10 +209,9 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
                     aFert,
                     aSpeed,
                     aLifespan,
-                    0,
-                    new ArrayList<>());
-                aTag = aGenes.writeToNBT();
+                    0);
             }
+            aTag = aGenes.writeToNBT();
         } else {
             aTag = aStack.getTagCompound();
         }
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
index ef36d73686..462d1271be 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.plugin.agrichem.logic;
 
-import java.util.ArrayList;
-
 import net.minecraft.nbt.NBTTagCompound;
 
 public class AlgaeGeneticData {
@@ -24,15 +22,12 @@ public class AlgaeGeneticData {
 
     private final float mProductionSpeed;
 
-    private final ArrayList<AlgaeGrowthRequirement> mSpecialRequirements;
-
     public AlgaeGeneticData() {
-        this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new ArrayList<>());
+        this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0);
     }
 
     public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh,
-        byte aTempTolerance, float aFertility, float aSpeed, byte aLifespan, int aGeneration,
-        ArrayList<AlgaeGrowthRequirement> aRequirements) {
+        byte aTempTolerance, float aFertility, float aSpeed, byte aLifespan, int aGeneration) {
         mIsDominant = isDominant;
         mRequiresLight = requiresLight;
         mSaltWater = isSalt;
@@ -42,7 +37,6 @@ public class AlgaeGeneticData {
         mProductionSpeed = aSpeed;
         mLifespan = aLifespan;
         mGeneration = aGeneration;
-        mSpecialRequirements = aRequirements;
     }
 
     public AlgaeGeneticData(NBTTagCompound aNBT) {
@@ -67,7 +61,6 @@ public class AlgaeGeneticData {
             mLifespan = aNBT.getByte("mLifespan");
             mGeneration = aNBT.getInteger("mGeneration");
         }
-        mSpecialRequirements = new ArrayList<>();
     }
 
     /**
@@ -109,10 +102,6 @@ public class AlgaeGeneticData {
         return this.mGeneration;
     }
 
-    public final ArrayList<AlgaeGrowthRequirement> getSpecialRequirements() {
-        return this.mSpecialRequirements;
-    }
-
     public NBTTagCompound writeToNBT() {
         NBTTagCompound aGenes = new NBTTagCompound();
         aGenes.setBoolean("mIsDominant", this.mIsDominant);
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java
deleted file mode 100644
index 07b89e5b5e..0000000000
--- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package gtPlusPlus.plugin.agrichem.logic;
-
-public class AlgaeGrowthRequirement {
-}