Delete/modify some reflection + more renaming (#3037)

6 files changed, 27 insertions, 104 deletions

diff --git a/src/main/java/bartworks/API/WerkstoffAPI.java b/src/main/java/bartworks/API/WerkstoffAPI.java
index d23ef1b75c..0a89e67550 100644
--- a/src/main/java/bartworks/API/WerkstoffAPI.java
+++ b/src/main/java/bartworks/API/WerkstoffAPI.java
@@ -14,22 +14,13 @@
 package bartworks.API;
 
 import bartworks.system.material.Werkstoff;
+import bartworks.system.material.WerkstoffLoader;
 
 public final class WerkstoffAPI {
 
-    @SuppressWarnings("rawtypes")
-    static Class w;
-
-    static {
-        try {
-            w = Class.forName("bartworks.system.material.WerkstoffLoader");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
     public static Werkstoff getWerkstoff(String aName) throws NoSuchFieldException, IllegalAccessException {
-        return (Werkstoff) w.getField(aName)
+        return (Werkstoff) WerkstoffLoader.class.getField(aName)
             .get(null);
     }
+
 }
diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java
index d5c9337a7c..858fda7a58 100644
--- a/src/main/java/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java
@@ -152,25 +152,12 @@ public class WerkstoffLoader {
     public static final SubTag ANAEROBE_SMELTING = SubTag.getNewSubTag("AnaerobeSmelting");
     public static final SubTag NOBLE_GAS_SMELTING = SubTag.getNewSubTag("NobleGasSmelting");
     public static final SubTag NO_BLAST = SubTag.getNewSubTag("NoBlast");
-    public static ItemList rotorMold;
-    public static ItemList rotorShape;
-    public static ItemList smallGearShape;
-    public static ItemList ringMold;
-    public static ItemList boltMold;
 
     public static void setUp() {
 
         OrePrefixes.cellMolten.mMaterialGenerationBits = 0b1000000;
         OrePrefixes.capsuleMolten.mMaterialGenerationBits = 0b1000000;
 
-        try {
-            WerkstoffLoader.rotorMold = Enum.valueOf(ItemList.class, "Shape_Mold_Rotor");
-            WerkstoffLoader.rotorShape = Enum.valueOf(ItemList.class, "Shape_Extruder_Rotor");
-            WerkstoffLoader.smallGearShape = Enum.valueOf(ItemList.class, "Shape_Extruder_Small_Gear");
-            WerkstoffLoader.ringMold = Enum.valueOf(ItemList.class, "Shape_Mold_Ring");
-            WerkstoffLoader.boltMold = Enum.valueOf(ItemList.class, "Shape_Mold_Bolt");
-        } catch (NullPointerException | IllegalArgumentException ignored) {}
-
         // add tiberium
         EnumUtils.createNewElement("Tr", 123L, 203L, 0L, -1L, null, "Tiberium", false);
 
diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
index a20996d463..5b5037ba08 100644
--- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
@@ -117,6 +117,8 @@ import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gregtech.common.blocks.BlockOresAbstract;
+import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.item.base.BaseItemComponent;
 
 public class PlatinumSludgeOverHaul {
 
@@ -1053,25 +1055,14 @@ public class PlatinumSludgeOverHaul {
             }
         }
 
-        try {
-            if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent")
-                .isAssignableFrom(
-                    stack.getItem()
-                        .getClass())
-                && !stack.getUnlocalizedName()
-                    .contains("dust")
-                && !stack.getUnlocalizedName()
-                    .contains("Dust")) {
-                return true;
-            }
-            if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular")
-                .isAssignableFrom(
-                    Block.getBlockFromItem(stack.getItem())
-                        .getClass())) {
-                return true;
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+        if (stack.getItem() instanceof BaseItemComponent && !stack.getUnlocalizedName()
+            .contains("dust")
+            && !stack.getUnlocalizedName()
+                .contains("Dust")) {
+            return true;
+        }
+        if (Block.getBlockFromItem(stack.getItem()) instanceof BlockBaseModular) {
+            return true;
         }
         if (stack.getItem() == HELICOPTER.getDust(1)
             .getItem()) {
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java
index 022cf4c3e6..5512274260 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java
@@ -38,7 +38,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
 import bartworks.system.material.Werkstoff;
-import bartworks.system.material.WerkstoffLoader;
 import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
@@ -185,18 +184,14 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable {
                 .addTo(wiremillRecipes);
 
             // smallGear
-            if (WerkstoffLoader.smallGearShape != null) {
-
-                GTValues.RA.stdBuilder()
-                    .itemInputs(werkstoff.get(ingot), WerkstoffLoader.smallGearShape.get(0L))
-                    .itemOutputs(werkstoff.get(gearGtSmall))
-                    .duration(
-                        (int) werkstoff.getStats()
-                            .getMass())
-                    .eut(8 * tVoltageMultiplier)
-                    .addTo(extruderRecipes);
-
-            }
+            GTValues.RA.stdBuilder()
+                .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Small_Gear.get(0L))
+                .itemOutputs(werkstoff.get(gearGtSmall))
+                .duration(
+                    (int) werkstoff.getStats()
+                        .getMass())
+                .eut(8 * tVoltageMultiplier)
+                .addTo(extruderRecipes);
 
             GTModHandler.addCraftingRecipe(
                 werkstoff.get(gearGtSmall),
@@ -234,16 +229,12 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable {
                 .eut(24)
                 .addTo(assemblerRecipes);
 
-            if (WerkstoffLoader.rotorShape != null) {
-
-                GTValues.RA.stdBuilder()
-                    .itemInputs(werkstoff.get(ingot, 5), WerkstoffLoader.rotorShape.get(0L))
-                    .itemOutputs(werkstoff.get(rotor))
-                    .duration(10 * SECONDS)
-                    .eut(60)
-                    .addTo(extruderRecipes);
-
-            }
+            GTValues.RA.stdBuilder()
+                .itemInputs(werkstoff.get(ingot, 5), ItemList.Shape_Extruder_Rotor.get(0L))
+                .itemOutputs(werkstoff.get(rotor))
+                .duration(10 * SECONDS)
+                .eut(60)
+                .addTo(extruderRecipes);
 
             // molten -> metal
             if (werkstoff.hasItemType(cellMolten)) {
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java
index 8d639574cb..710f122592 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java
@@ -300,12 +300,6 @@ public class MoltenCellLoader implements IWerkstoffRunnable {
                         .getMass() > 128 ? 64 : 30)
                 .addTo(fluidSolidifierRecipes);
 
-            // No Spring Molds
-
-            if (WerkstoffLoader.rotorMold == null) {
-                return;
-            }
-
             GTValues.RA.stdBuilder()
                 .itemInputs(ItemList.Shape_Mold_Rotor.get(0))
                 .itemOutputs(werkstoff.get(rotor))
diff --git a/src/main/java/bartworks/util/CachedReflectionUtils.java b/src/main/java/bartworks/util/CachedReflectionUtils.java
deleted file mode 100644
index a02b644b4a..0000000000
--- a/src/main/java/bartworks/util/CachedReflectionUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package bartworks.util;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-
-public class CachedReflectionUtils {
-
-    private static final ClassValue<Map<String, Field>> fields = new ConcurrentMapClassValue();
-    private static final ClassValue<Map<String, Field>> declaredFields = new ConcurrentMapClassValue();
-
-    public static Field getField(final Class<?> cls, final String fieldName) {
-        return fields.get(cls)
-            .computeIfAbsent(fieldName, f -> FieldUtils.getField(cls, f, true));
-    }
-
-    public static Field getDeclaredField(final Class<?> cls, final String fieldName) {
-        return declaredFields.get(cls)
-            .computeIfAbsent(fieldName, f -> FieldUtils.getDeclaredField(cls, f, true));
-    }
-
-    private static class ConcurrentMapClassValue extends ClassValue<Map<String, Field>> {
-
-        @Override
-        protected Map<String, Field> computeValue(Class<?> type) {
-            return new ConcurrentHashMap<>();
-        }
-    }
-}