Disable MixinCraftingManager when config is off

Co-authored-by: Alexdoru <[email protected]>

Author: embeddedt

src/main/java/org/embeddedt/archaicfix/ArchaicFix.java

@@ -82,6 +82,9 @@ public void serverStart(FMLServerStartingEvent event) {
 
     @EventHandler
     public void serverStarted(FMLServerStartedEvent event) {
+        if (!(CraftingManager.getInstance() instanceof IFasterCraftingManager)) {
+            return;
+        }
         ((IFasterCraftingManager)CraftingManager.getInstance()).clearRecipeCache();
         ArchaicLogger.LOGGER.info("Cleared recipe cache");
     }

src/main/java/org/embeddedt/archaicfix/FixHelper.java

@@ -42,7 +42,7 @@ public void onOreRegister(OreDictionary.OreRegisterEvent event) {
                 recipe.invalidatePotentialItems();
         }
         recipesHoldingPotentialItems.clear();
-        if(CraftingManager.getInstance() != null)
+        if(CraftingManager.getInstance() instanceof IFasterCraftingManager)
             ((IFasterCraftingManager)CraftingManager.getInstance()).clearRecipeCache();
         OreDictIterator.clearCache(event.Name);
     }

src/main/java/org/embeddedt/archaicfix/asm/Mixin.java

@@ -26,7 +26,6 @@ public enum Mixin implements IMixins {
                     "core.MixinMaterialLiquid",
                     "core.MixinChunkProviderServer",
                     "core.MixinChunkIOProvider",
-                    "core.MixinCraftingManager",
                     "core.MixinSpawnerAnimals",
                     "core.MixinShapedOreRecipe",
                     "core.MixinLongHashMap",
@@ -65,6 +64,10 @@ public enum Mixin implements IMixins {
                     "core.MixinFMLClientHandler",
                     "core.MixinSplashProgress",
                     "core.AccessorSplashProgress")),
+    RECIPE_CACHING(new ArchaicBuilder()
+            .setPhase(Phase.EARLY)
+            .setApplyIf(() -> ArchaicConfig.cacheRecipes)
+            .addCommonMixins("core.MixinCraftingManager")),
     PHOSPHOR(new ArchaicBuilder()
             .setPhase(Phase.EARLY)
             .setApplyIf(() -> ArchaicConfig.enablePhosphor)

src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinCraftingManager.java

@@ -11,7 +11,6 @@
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 import org.embeddedt.archaicfix.ArchaicLogger;
-import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.embeddedt.archaicfix.recipe.IFasterCraftingManager;
 import org.embeddedt.archaicfix.recipe.LastMatchedInfo;
 import org.embeddedt.archaicfix.recipe.RecipeCacheLoader;
@@ -41,8 +40,6 @@ public class MixinCraftingManager implements IFasterCraftingManager {
             to =  @At(value = "INVOKE", target = "Ljava/util/List;size()I")
     ), cancellable = true)
     private void fasterRecipeSearch(InventoryCrafting inventory, World world, CallbackInfoReturnable<ItemStack> cir) {
-        if(!ArchaicConfig.cacheRecipes)
-            return;
         LastMatchedInfo retInfo = lastMatchedInfo;
         if(retInfo == null || !retInfo.matches(inventory)) {
             Set<Item> stacks = new HashSet<>();