Cache sorted recipe list in NEI handlers

3 files changed, 39 insertions, 28 deletions

diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index 55efd20920..b9701bb451 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -152,6 +152,7 @@ public class GT_Client extends GT_Proxy
     private GT_ClientPreference mPreference;
     private boolean mFirstTick = false;
     public static final int ROTATION_MARKER_RESOLUTION = 120;
+    private int mReloadCount;
 
     public GT_Client() {
         mCapeRenderer = new GT_CapeRenderer(mCapeList);
@@ -505,6 +506,12 @@ public class GT_Client extends GT_Proxy
     @SubscribeEvent
     public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) {
         mFirstTick = true;
+        mReloadCount++;
+    }
+
+    @Override
+    public int getReloadCount() {
+        return mReloadCount;
     }
 
     @SubscribeEvent
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index ae95184062..2e18ea9693 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -776,6 +776,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
     public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) {
     }
 
+    public int getReloadCount() {
+        return 0;
+    }
+
     @SubscribeEvent
     public void onArrowNockEvent(ArrowNockEvent aEvent) {
         if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result))
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index f51acd9a77..f28c014bda 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -32,14 +32,18 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
+import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class GT_NEI_DefaultHandler extends RecipeMapHandler {
     public static final int sOffsetX = 5;
     public static final int sOffsetY = 11;
+    private int mCachedRecipesVersion = -1;
+    private SoftReference<List<CachedDefaultRecipe>> mCachedRecipes = null;
 
     static {
         GuiContainerManager.addInputHandler(new GT_RectHandler());
@@ -51,12 +55,27 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
         this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier()));
     }
 
+    @Deprecated
     public List<GT_Recipe> getSortedRecipes() {
         List<GT_Recipe> result = new ArrayList<>(this.mRecipeMap.mRecipeList);
         Collections.sort(result);
         return result;
     }
 
+    public List<CachedDefaultRecipe> getCache() {
+        List<CachedDefaultRecipe> cache;
+        if (mCachedRecipesVersion == GT_Mod.gregtechproxy.getReloadCount() || mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) {
+            cache = mRecipeMap.mRecipeList.stream()  // do not use parallel stream. This is already parallelized by NEI
+                    .filter(r -> !r.mHidden)
+                    .map(CachedDefaultRecipe::new)
+                    .collect(Collectors.toList());
+            // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model
+            // so we do not need any synchronization here
+            mCachedRecipes = new SoftReference<>(cache);
+        }
+        return cache;
+    }
+
     public static void drawText(int aX, int aY, String aString, int aColor) {
         Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor);
     }
@@ -69,11 +88,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
     @Override
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOverlayIdentifier())) {
-            for (GT_Recipe tRecipe : getSortedRecipes()) {
-                if (!tRecipe.mHidden) {
-                    this.arecipes.add(new CachedDefaultRecipe(tRecipe));
-                }
-            }
+            arecipes.addAll(getCache());
         } else {
             super.loadCraftingRecipes(outputId, results);
         }
@@ -83,7 +98,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
     public void loadCraftingRecipes(ItemStack aResult) {
         ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
 
-        ArrayList<ItemStack> tResults = new ArrayList();
+        ArrayList<ItemStack> tResults = new ArrayList<>();
         tResults.add(aResult);
         tResults.add(GT_OreDictUnificator.get(true, aResult));
         if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
@@ -101,16 +116,9 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
         if (tFluidStack != null) {
             tResults.addAll(GT_Utility.getContainersFromFluid(tFluidStack));
         }
-        for (GT_Recipe tRecipe : getSortedRecipes()) {
-            if (!tRecipe.mHidden) {
-                CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
-                for (ItemStack tStack : tResults) {
-                    if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) {
-                        this.arecipes.add(tNEIRecipe);
-                        break;
-                    }
-                }
-            }
+        for (CachedDefaultRecipe recipe : getCache()) {
+            if (tResults.stream().anyMatch(stack -> recipe.contains(recipe.mOutputs, stack)))
+                arecipes.add(recipe);
         }
     }
 
@@ -118,7 +126,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
     public void loadUsageRecipes(ItemStack aInput) {
         ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
 
-        ArrayList<ItemStack> tInputs = new ArrayList();
+        ArrayList<ItemStack> tInputs = new ArrayList<>();
         tInputs.add(aInput);
         tInputs.add(GT_OreDictUnificator.get(false, aInput));
         if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
@@ -136,18 +144,10 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
         if (tFluidStack != null) {
             tInputs.addAll(GT_Utility.getContainersFromFluid(tFluidStack));
         }
-        for (GT_Recipe tRecipe : getSortedRecipes()) {
-            if (!tRecipe.mHidden) {
-                CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
-                for (ItemStack tStack : tInputs) {
-                    if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) {
-                        this.arecipes.add(tNEIRecipe);
-                        break;
-                    }
-                }
-            }
+        for (CachedDefaultRecipe recipe : getCache()) {
+            if (tInputs.stream().anyMatch(stack -> recipe.contains(recipe.mInputs, stack)))
+                arecipes.add(recipe);
         }
-        CachedDefaultRecipe tNEIRecipe;
     }
 
     @Override