fix GTNewHorizons#479 (GTNewHorizons#483)

slprime · May 27, 2024 · dc4426d · dc4426d
1 parent d05a9ea
commit dc4426d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java
@@ -667,6 +667,10 @@ public static boolean loadCatalystsFromJar() {
         return !getBooleanSetting("tools.catalyst_load_from_config");
     }
 
+    public static boolean isProfileRecipeEnabled() {
+        return NEIClientConfig.getBooleanSetting("inventory.profileRecipes");
+    }
+
     public static void setEnabled(boolean flag) {
         getSetting("inventory.widgetsenabled").setBooleanValue(flag);
     }

diff --git a/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java
@@ -39,7 +39,7 @@ public String getRecipeName() {
 
     @Override
     public int numRecipes() {
-        if (!NEIClientConfig.getBooleanSetting("inventory.profileRecipes")) return 0;
+        if (!NEIClientConfig.isProfileRecipeEnabled()) return 0;
 
         return (int) Math.ceil(
                 ((crafting ? GuiCraftingRecipe.craftinghandlers.size() : GuiUsageRecipe.usagehandlers.size()) - 1)

diff --git a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java
@@ -35,8 +35,15 @@ class RecipeHandlerQuery<T extends IRecipeHandler> {
 
     ArrayList<T> runWithProfiling(String profilerSection) {
         TaskProfiler profiler = ProfilerRecipeHandler.getProfiler();
-        profiler.clear();
-        profiler.start(profilerSection);
+
+        // Save the current config state here, as it may be altered
+        // if getRecipeHandlesParallel took so long and player accidentally changed config.
+        boolean profileRecipes = NEIClientConfig.isProfileRecipeEnabled();
+        if (profileRecipes) {
+            profiler.clear();
+            profiler.start(profilerSection);
+        }
+
         try {
             ArrayList<T> handlers = getRecipeHandlersParallel();
 
@@ -49,7 +56,7 @@ ArrayList<T> runWithProfiling(String profilerSection) {
             displayRecipeLookupError();
             return new ArrayList<>(0);
         } finally {
-            profiler.end();
+            if (profileRecipes) profiler.end();
         }
     }
 

diff --git a/src/main/java/codechicken/nei/util/AsyncTaskProfiler.java b/src/main/java/codechicken/nei/util/AsyncTaskProfiler.java
@@ -14,14 +14,21 @@ public class AsyncTaskProfiler extends TaskProfiler {
 
     public Map<String, Long> times = new ConcurrentHashMap<>();
 
+    @Override
     public void start(String section) {
         if (section == null) section = "<unnamed>";
         threadedProfiler.get().start(section);
     }
 
+    @Override
     public void end() {
-        threadedProfiler.get().end();
-        times.putAll(threadedProfiler.get().times);
+        TaskProfiler profiler = threadedProfiler.get();
+        if (profiler != null) {
+            profiler.end();
+            if (profiler.times != null && !profiler.times.isEmpty()) {
+                times.putAll(threadedProfiler.get().times);
+            }
+        }
     }
 
     @Override