Optimized Replacing Vanilla Materials code, removed uselessly-repeated operations

2 files changed, 84 insertions, 73 deletions

diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
index 0868ff41c8..34cf7ca80e 100644
--- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
+++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
@@ -1,5 +1,6 @@
 package gregtech.api.util;
 
+import com.google.common.base.Stopwatch;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
@@ -28,52 +29,52 @@ public class GT_RecipeRegistrator {
     public static final List<Materials> sRodMaterialList = new ArrayList<Materials>();
     private static final ItemStack sMt1 = new ItemStack(Blocks.dirt, 1, 0), sMt2 = new ItemStack(Blocks.dirt, 1, 0);
     private static final String s_H = "h", s_F = "f", s_I = "I", s_P = "P", s_R = "R";
-    private static final ItemStack[][]
-            sShapes1 = new ItemStack[][]{
-            {sMt1, null, sMt1, sMt1, sMt1, sMt1, null, sMt1, null},
-            {sMt1, null, sMt1, sMt1, null, sMt1, sMt1, sMt1, sMt1},
-            {null, sMt1, null, sMt1, sMt1, sMt1, sMt1, null, sMt1},
-            {sMt1, sMt1, sMt1, sMt1, null, sMt1, null, null, null},
-            {sMt1, null, sMt1, sMt1, sMt1, sMt1, sMt1, sMt1, sMt1},
-            {sMt1, sMt1, sMt1, sMt1, null, sMt1, sMt1, null, sMt1},
-            {null, null, null, sMt1, null, sMt1, sMt1, null, sMt1},
-            {null, sMt1, null, null, sMt1, null, null, sMt2, null},
-            {sMt1, sMt1, sMt1, null, sMt2, null, null, sMt2, null},
-            {null, sMt1, null, null, sMt2, null, null, sMt2, null},
-            {sMt1, sMt1, null, sMt1, sMt2, null, null, sMt2, null},
-            {null, sMt1, sMt1, null, sMt2, sMt1, null, sMt2, null},
-            {sMt1, sMt1, null, null, sMt2, null, null, sMt2, null},
-            {null, sMt1, sMt1, null, sMt2, null, null, sMt2, null},
-            {null, sMt1, null, sMt1, null, null, null, sMt1, sMt2},
-            {null, sMt1, null, null, null, sMt1, sMt2, sMt1, null},
-            {null, sMt1, null, sMt1, null, sMt1, null, null, sMt2},
-            {null, sMt1, null, sMt1, null, sMt1, sMt2, null, null},
-            {null, sMt2, null, null, sMt1, null, null, sMt1, null},
-            {null, sMt2, null, null, sMt2, null, sMt1, sMt1, sMt1},
-            {null, sMt2, null, null, sMt2, null, null, sMt1, null},
-            {null, sMt2, null, sMt1, sMt2, null, sMt1, sMt1, null},
-            {null, sMt2, null, null, sMt2, sMt1, null, sMt1, sMt1},
-            {null, sMt2, null, null, sMt2, null, sMt1, sMt1, null},
-            {sMt1, null, null, null, sMt2, null, null, null, sMt2},
-            {null, null, sMt1, null, sMt2, null, sMt2, null, null},
-            {sMt1, null, null, null, sMt2, null, null, null, null},
-            {null, null, sMt1, null, sMt2, null, null, null, null},
-            {sMt1, sMt2, null, null, null, null, null, null, null},
-            {sMt2, sMt1, null, null, null, null, null, null, null},
-            {sMt1, null, null, sMt2, null, null, null, null, null},
-            {sMt2, null, null, sMt1, null, null, null, null, null},
-            {sMt1, sMt1, sMt1, sMt1, sMt1, sMt1, null, sMt2, null},
-            {sMt1, sMt1, null, sMt1, sMt1, sMt2, sMt1, sMt1, null},
-            {null, sMt1, sMt1, sMt2, sMt1, sMt1, null, sMt1, sMt1},
-            {null, sMt2, null, sMt1, sMt1, sMt1, sMt1, sMt1, sMt1},
-            {sMt1, sMt1, sMt1, sMt1, sMt2, sMt1, null, sMt2, null},
-            {sMt1, sMt1, null, sMt1, sMt2, sMt2, sMt1, sMt1, null},
-            {null, sMt1, sMt1, sMt2, sMt2, sMt1, null, sMt1, sMt1},
-            {null, sMt2, null, sMt1, sMt2, sMt1, sMt1, sMt1, sMt1},
-            {sMt1, null, null, null, sMt1, null, null, null, null},
-            {null, sMt1, null, sMt1, null, null, null, null, null},
-            {sMt1, sMt1, null, sMt2, null, sMt1, sMt2, null, null},
-            {null, sMt1, sMt1, sMt1, null, sMt2, null, null, sMt2}
+    private static final RecipeShape[]
+            sShapes = new RecipeShape[]{
+            new RecipeShape(sMt1, null, sMt1, sMt1, sMt1, sMt1, null, sMt1, null),
+            new RecipeShape(sMt1, null, sMt1, sMt1, null, sMt1, sMt1, sMt1, sMt1),
+            new RecipeShape(null, sMt1, null, sMt1, sMt1, sMt1, sMt1, null, sMt1),
+            new RecipeShape(sMt1, sMt1, sMt1, sMt1, null, sMt1, null, null, null),
+            new RecipeShape(sMt1, null, sMt1, sMt1, sMt1, sMt1, sMt1, sMt1, sMt1),
+            new RecipeShape(sMt1, sMt1, sMt1, sMt1, null, sMt1, sMt1, null, sMt1),
+            new RecipeShape(null, null, null, sMt1, null, sMt1, sMt1, null, sMt1),
+            new RecipeShape(null, sMt1, null, null, sMt1, null, null, sMt2, null),
+            new RecipeShape(sMt1, sMt1, sMt1, null, sMt2, null, null, sMt2, null),
+            new RecipeShape(null, sMt1, null, null, sMt2, null, null, sMt2, null),
+            new RecipeShape(sMt1, sMt1, null, sMt1, sMt2, null, null, sMt2, null),
+            new RecipeShape(null, sMt1, sMt1, null, sMt2, sMt1, null, sMt2, null),
+            new RecipeShape(sMt1, sMt1, null, null, sMt2, null, null, sMt2, null),
+            new RecipeShape(null, sMt1, sMt1, null, sMt2, null, null, sMt2, null),
+            new RecipeShape(null, sMt1, null, sMt1, null, null, null, sMt1, sMt2),
+            new RecipeShape(null, sMt1, null, null, null, sMt1, sMt2, sMt1, null),
+            new RecipeShape(null, sMt1, null, sMt1, null, sMt1, null, null, sMt2),
+            new RecipeShape(null, sMt1, null, sMt1, null, sMt1, sMt2, null, null),
+            new RecipeShape(null, sMt2, null, null, sMt1, null, null, sMt1, null),
+            new RecipeShape(null, sMt2, null, null, sMt2, null, sMt1, sMt1, sMt1),
+            new RecipeShape(null, sMt2, null, null, sMt2, null, null, sMt1, null),
+            new RecipeShape(null, sMt2, null, sMt1, sMt2, null, sMt1, sMt1, null),
+            new RecipeShape(null, sMt2, null, null, sMt2, sMt1, null, sMt1, sMt1),
+            new RecipeShape(null, sMt2, null, null, sMt2, null, sMt1, sMt1, null),
+            new RecipeShape(sMt1, null, null, null, sMt2, null, null, null, sMt2),
+            new RecipeShape(null, null, sMt1, null, sMt2, null, sMt2, null, null),
+            new RecipeShape(sMt1, null, null, null, sMt2, null, null, null, null),
+            new RecipeShape(null, null, sMt1, null, sMt2, null, null, null, null),
+            new RecipeShape(sMt1, sMt2, null, null, null, null, null, null, null),
+            new RecipeShape(sMt2, sMt1, null, null, null, null, null, null, null),
+            new RecipeShape(sMt1, null, null, sMt2, null, null, null, null, null),
+            new RecipeShape(sMt2, null, null, sMt1, null, null, null, null, null),
+            new RecipeShape(sMt1, sMt1, sMt1, sMt1, sMt1, sMt1, null, sMt2, null),
+            new RecipeShape(sMt1, sMt1, null, sMt1, sMt1, sMt2, sMt1, sMt1, null),
+            new RecipeShape(null, sMt1, sMt1, sMt2, sMt1, sMt1, null, sMt1, sMt1),
+            new RecipeShape(null, sMt2, null, sMt1, sMt1, sMt1, sMt1, sMt1, sMt1),
+            new RecipeShape(sMt1, sMt1, sMt1, sMt1, sMt2, sMt1, null, sMt2, null),
+            new RecipeShape(sMt1, sMt1, null, sMt1, sMt2, sMt2, sMt1, sMt1, null),
+            new RecipeShape(null, sMt1, sMt1, sMt2, sMt2, sMt1, null, sMt1, sMt1),
+            new RecipeShape(null, sMt2, null, sMt1, sMt2, sMt1, sMt1, sMt1, sMt1),
+            new RecipeShape(sMt1, null, null, null, sMt1, null, null, null, null),
+            new RecipeShape(null, sMt1, null, sMt1, null, null, null, null, null),
+            new RecipeShape(sMt1, sMt1, null, sMt2, null, sMt1, sMt2, null, null),
+            new RecipeShape(null, sMt1, sMt1, sMt1, null, sMt2, null, null, sMt2)
     };
     private static final String[][] sShapesA = new String[][]{
             null,
@@ -307,10 +308,7 @@ public class GT_RecipeRegistrator {
      */
     public static synchronized void registerUsagesForMaterials(String aPlate, boolean aRecipeReplacing, ItemStack... aMats) {
         for (ItemStack aMat : aMats) {
-            if (aMat == null)
-                continue;
-
-            aMat = GT_Utility.copy(aMat);
+            aMat = GT_Utility.copyOrNull(aMat);
 
             if (aMat == null)
                 continue;
@@ -327,20 +325,17 @@ public class GT_RecipeRegistrator {
             sMt2.stackSize = 1;
             Items.feather.setDamage(sMt2, 0);
 
-            for (ItemStack[] tRecipe : sShapes1) {
-                int tAmount1 = 0;
-                for (ItemStack tMat : tRecipe) {
-                    if (tMat == sMt1) tAmount1++;
-                }
-                if (aItemData != null && aItemData.hasValidPrefixMaterialData())
-                    for (ItemStack tCrafted : GT_ModHandler.getRecipeOutputsBuffered(tRecipe)) {
-                        GT_OreDictUnificator.addItemData(tCrafted, new ItemData(aItemData.mMaterial.mMaterial, aItemData.mMaterial.mAmount * tAmount1));
-//                        GT_Log.out.println("###################################################################################");
-//                        GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aPlate);
-//                        GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aMat.getUnlocalizedName());
-//                        GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aMat.getDisplayName());
-//                        GT_Log.out.println("###################################################################################");
+            if(aItemData != null && aItemData.hasValidPrefixMaterialData()) {
+                for (RecipeShape tRecipe : sShapes) {
+                    for (ItemStack tCrafted : GT_ModHandler.getRecipeOutputsBuffered(tRecipe.shape)) {
+                        GT_OreDictUnificator.addItemData(tCrafted, new ItemData(aItemData.mMaterial.mMaterial, aItemData.mMaterial.mAmount * tRecipe.amount1));
+                        //                        GT_Log.out.println("###################################################################################");
+                        //                        GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aPlate);
+                        //                        GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aMat.getUnlocalizedName());
+                        //                        GT_Log.out.println("registerUsagesForMaterials used aPlate: "+aMat.getDisplayName());
+                        //                        GT_Log.out.println("###################################################################################");
                     }
+                }
             }
             registerStickStuff(aPlate, aItemData, aRecipeReplacing);
         }
@@ -355,22 +350,17 @@ public class GT_RecipeRegistrator {
                 sMt2.stackSize = 1;
                 Items.feather.setDamage(sMt2, Items.feather.getDamage(tMt2));
 
-                for (int i = 0; i < sShapes1.length; i++) {
-                    ItemStack[] tRecipe = sShapes1[i];
+                for (int i = 0; i < sShapes.length; i++) {
+                    RecipeShape tRecipe = sShapes[i];
 
-                    int tAmount1 = 0, tAmount2 = 0;
-                    for (ItemStack tMat : tRecipe) {
-                        if (tMat == sMt1) tAmount1++;
-                        if (tMat == sMt2) tAmount2++;
-                    }
-                    for (ItemStack tCrafted : GT_ModHandler.getVanillyToolRecipeOutputs(tRecipe)) {
+                    for (ItemStack tCrafted : GT_ModHandler.getVanillyToolRecipeOutputs(tRecipe.shape)) {
                         if (aItemData != null && aItemData.hasValidPrefixMaterialData())
-                            GT_OreDictUnificator.addItemData(tCrafted, new ItemData(aItemData.mMaterial.mMaterial, aItemData.mMaterial.mAmount * tAmount1, new MaterialStack(tMaterial, OrePrefixes.stick.mMaterialAmount * tAmount2)));
+                            GT_OreDictUnificator.addItemData(tCrafted, new ItemData(aItemData.mMaterial.mMaterial, aItemData.mMaterial.mAmount * tRecipe.amount1, new MaterialStack(tMaterial, OrePrefixes.stick.mMaterialAmount * tRecipe.amount2)));
 
                         if (aRecipeReplacing && aPlate != null && sShapesA[i] != null && sShapesA[i].length > 1) {
                             assert aItemData != null;
                             if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, aItemData.mMaterial.mMaterial + "." + sShapesA[i][0], true)) {
-                                if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe))) {
+                                if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe.shape))) {
 //                                    GT_Log.out.println("###################################################################################");
 //                                    GT_Log.out.println("registerStickStuff used aPlate: "+aPlate);
 //                                    GT_Log.out.println("###################################################################################");
@@ -398,4 +388,18 @@ public class GT_RecipeRegistrator {
         return Arrays.stream(VANILLA_MATS).anyMatch(mat -> mat == materials);
     }
 
+    private static class RecipeShape {
+        private final ItemStack[] shape;
+        private int amount1;
+        private int amount2;
+
+        public RecipeShape(ItemStack... shape) {
+            this.shape = shape;
+
+            for (ItemStack stack : shape) {
+                if(stack == sMt1) this.amount1++;
+                if(stack == sMt2) this.amount2++;
+            }
+        }
+    }
 }
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 8cbb44fe07..8e283956cb 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -90,6 +90,7 @@ import net.minecraftforge.fluids.IFluidContainerItem;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -1651,6 +1652,12 @@ public class GT_Utility {
         return null;
     }
 
+    @Nullable
+    public static ItemStack copyOrNull(@Nullable ItemStack stack) {
+        if (isStackValid(stack)) return stack.copy();
+        return null;
+    }
+
     public static ItemStack copyAmount(long aAmount, Object... aStacks) {
         ItemStack rStack = copy(aStacks);
         if (isStackInvalid(rStack)) return null;