2.2.2b [fix] Fix extreme tick rate spike when Extra Delight mixer/press compat is working

Author: MarbleGateKeeper

CHANGELOG.md

@@ -1,10 +1,5 @@
-## Create: Central Kitchen 2.2.2
+## Create: Central Kitchen 2.2.2b
 
 ### Fix
-* **(Critical)** Fix Extra Delight recipe conversion does not working and mess up Machines
-* Fix an error in Extra Delight Ponder
-
-### Revert
-* Revert last patch for Placebo crash since the issue seems to be not on this side and current patch cause else issue.
-
-If you encounter another crash and also have Placebo installed, please inform me with complete log, thanks!
+* Fix extreme tick rate spike when Extra Delight mixer/press compat is working
+* Fix a registration issue when Json Things and Hostile Neural Networks are present.

gradle.properties

@@ -17,7 +17,7 @@ mod_id = create_central_kitchen
 mod_artifact_id = create-central-kitchen
 mod_name = Create: Central Kitchen
 mod_license = LGPL-3.0-or-later
-mod_version = 2.2.2
+mod_version = 2.2.2b
 mod_group_id = plus.dragons.createcentralkitchen
 mod_authors = DragonsPlus
 mod_description = Integrated cooking automation for Create

src/integration/extradelight/java/plus/dragons/createcentralkitchen/mixin/extradelight/RecipeFinderMixin.java

@@ -21,41 +21,62 @@
 import com.lance5057.extradelight.ExtraDelightRecipes;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.simibubi.create.foundation.recipe.RecipeFinder;
+
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
+
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import plus.dragons.createcentralkitchen.config.CCKConfig;
 import plus.dragons.createcentralkitchen.integration.extradelight.recipe.ExtraDelightRecipeConverters;
 
 @Mixin(RecipeFinder.class)
 public abstract class RecipeFinderMixin {
+
+    @Unique
+    @Nullable
+    private static Collection<RecipeHolder<? extends Recipe<?>>> create_central_kitchen$CACHED_MIXING_RECIPE;
+
+    @Unique
+    @Nullable
+    private static Collection<RecipeHolder<? extends Recipe<?>>> create_central_kitchen$CACHED_COMPACTING_RECIPE;
+
     @ModifyReturnValue(method = "get", at = @At(value = "RETURN"))
     private static List<RecipeHolder<? extends Recipe<?>>> addRecipe(List<RecipeHolder<? extends Recipe<?>>> original, @Nullable Object cacheKey, Level level, Predicate<RecipeHolder<? extends Recipe<?>>> conditions) {
         if (cacheKey == MechanicalMixerBlockEntityAccessor.getShapelessOrMixingRecipesKey()) {
-            var recipeManager = level.getRecipeManager();
-            if (CCKConfig.recipes().convertMeltingPotRecipesToMixingRecipes.get()) {
-                var r = recipeManager.getAllRecipesFor(ExtraDelightRecipes.MELTING_POT.get())
-                        .stream().map(ExtraDelightRecipeConverters.AUTOMATIC_MELTING).filter(conditions).collect(Collectors.toSet());
-                original.addAll(r);
+            if(create_central_kitchen$CACHED_MIXING_RECIPE == null) {
+                var recipeManager = level.getRecipeManager();
+                if (CCKConfig.recipes().convertMeltingPotRecipesToMixingRecipes.get()) {
+                    create_central_kitchen$CACHED_MIXING_RECIPE =
+                    recipeManager.getAllRecipesFor(ExtraDelightRecipes.MELTING_POT.get())
+                            .stream().map(ExtraDelightRecipeConverters.AUTOMATIC_MELTING).filter(conditions).collect(Collectors.toSet());
+                }
+                original.addAll(create_central_kitchen$CACHED_MIXING_RECIPE);
             }
         } else if (cacheKey == MechanicalPressBlockEntityAccessor.getCompressingRecipesKey()) {
             var recipeManager = level.getRecipeManager();
-            if (CCKConfig.recipes().convertMortarGrindingRecipesToCompactingRecipes.get()) {
-                var r = recipeManager.getAllRecipesFor(ExtraDelightRecipes.MORTAR.get())
-                        .stream().map(ExtraDelightRecipeConverters.AUTOMATIC_GRINDING).filter(conditions).collect(Collectors.toSet());
-                original.addAll(r);
-            }
-            if (CCKConfig.recipes().convertJuicerRecipesToCompactingRecipes.get()) {
-                var r = recipeManager.getAllRecipesFor(ExtraDelightRecipes.JUICER.get())
-                        .stream().map(ExtraDelightRecipeConverters.AUTOMATIC_JUICING).filter(conditions).collect(Collectors.toSet());
-                original.addAll(r);
+            if(create_central_kitchen$CACHED_COMPACTING_RECIPE == null) {
+                create_central_kitchen$CACHED_COMPACTING_RECIPE = new HashSet<>();
+                if (CCKConfig.recipes().convertMortarGrindingRecipesToCompactingRecipes.get()) {
+                    create_central_kitchen$CACHED_COMPACTING_RECIPE.addAll(recipeManager.getAllRecipesFor(ExtraDelightRecipes.MORTAR.get())
+                            .stream().map(ExtraDelightRecipeConverters.AUTOMATIC_GRINDING).filter(conditions).collect(Collectors.toSet()));
+
+                }
+                if (CCKConfig.recipes().convertJuicerRecipesToCompactingRecipes.get()) {
+                    create_central_kitchen$CACHED_COMPACTING_RECIPE.addAll(recipeManager.getAllRecipesFor(ExtraDelightRecipes.JUICER.get())
+                            .stream().map(ExtraDelightRecipeConverters.AUTOMATIC_JUICING).filter(conditions).collect(Collectors.toSet()));
+
+                }
             }
+            original.addAll(create_central_kitchen$CACHED_COMPACTING_RECIPE);
         }
         return original;
     }