Delete more reflection (#3233)

1 files changed, 8 insertions, 31 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
index 89fdf23ec6..5f5160b6a4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
@@ -7,15 +7,12 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 import java.util.ArrayList;
-import java.util.Map;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
-
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -33,7 +30,7 @@ public class RecipeGenRecycling implements Runnable {
     public static ArrayList<Runnable> mQueuedRecyclingGenerators = new ArrayList<>();
 
     public static void executeGenerators() {
-        if (mQueuedRecyclingGenerators.size() > 0) {
+        if (!mQueuedRecyclingGenerators.isEmpty()) {
             for (Runnable R : mQueuedRecyclingGenerators) {
                 R.run();
             }
@@ -41,21 +38,15 @@ public class RecipeGenRecycling implements Runnable {
     }
 
     final Material toGenerate;
-    public static Map<String, ItemStack> mNameMap;
 
     public RecipeGenRecycling(final Material M) {
         this.toGenerate = M;
-        if (mNameMap == null) {
-            mNameMap = this.getNameMap();
-        }
         mQueuedRecyclingGenerators.add(this);
     }
 
     @Override
     public void run() {
-        if (mNameMap != null) {
-            generateRecipes(this.toGenerate);
-        }
+        generateRecipes(this.toGenerate);
     }
 
     public static void generateRecipes(final Material material) {
@@ -253,12 +244,14 @@ public class RecipeGenRecycling implements Runnable {
             Logger.modLogger.warn("Returning Null. Method: ", new Exception());
             return null;
         }
-        if (!mNameMap.containsKey(aName.toString()) && aMentionPossibleTypos) {
+        if (!GTOreDictUnificator.getName2StackMap()
+            .containsKey(aName.toString()) && aMentionPossibleTypos) {
             Logger.WARNING("Unknown Key for Unification, Typo? " + aName);
         }
         return GTUtility.copyAmount(
             aAmount,
-            new Object[] { mNameMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement });
+            new Object[] { GTOreDictUnificator.getName2StackMap()
+                .get(aName.toString()), getFirstOre(aName, aAmount), aReplacement });
     }
 
     public static ItemStack getFirstOre(final Object aName, final long aAmount) {
@@ -266,7 +259,8 @@ public class RecipeGenRecycling implements Runnable {
             Logger.modLogger.warn("Returning Null. Method: ", new Exception());
             return null;
         }
-        final ItemStack tStack = mNameMap.get(aName.toString());
+        final ItemStack tStack = GTOreDictUnificator.getName2StackMap()
+            .get(aName.toString());
         if (GTUtility.isStackValid(tStack)) {
             Logger.WARNING("Found valid stack.");
             return GTUtility.copyAmount(aAmount, new Object[] { tStack });
@@ -289,23 +283,6 @@ public class RecipeGenRecycling implements Runnable {
         return rList;
     }
 
-    @SuppressWarnings("unchecked")
-    public Map<String, ItemStack> getNameMap() {
-        Map<String, ItemStack> tempMap;
-        try {
-            tempMap = (Map<String, ItemStack>) FieldUtils
-                .readStaticField(GTOreDictUnificator.class, "sName2StackMap", true);
-            if (tempMap != null) {
-                Logger.WARNING("Found 'sName2StackMap' in GTOreDictUnificator.class.");
-                return tempMap;
-            }
-        } catch (final IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        Logger.WARNING("Invalid map stored in GTOreDictUnificator.class, unable to find sName2StackMap field.");
-        return null;
-    }
-
     public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) {
 
         try {