fix: confusing between some book and stonecutting recipes

some book and stonecutting recipes have same input, which may lead to wrongly use of book recipes
wendavid552 · Feb 23, 2023 · a1b95c8 · a1b95c8
1 parent 245db43
commit a1b95c8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/fi/dy/masa/itemscroller/event/KeybindCallbacks.java b/src/main/java/fi/dy/masa/itemscroller/event/KeybindCallbacks.java
@@ -7,6 +7,7 @@
 import net.minecraft.client.gui.screen.ingame.StonecutterScreen;
 import net.minecraft.recipe.CraftingRecipe;
 import net.minecraft.recipe.StonecuttingRecipe;
+import net.minecraft.screen.StonecutterScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import fi.dy.masa.itemscroller.ItemScroller;
 import fi.dy.masa.itemscroller.config.Configs;
@@ -189,20 +190,19 @@ public void onClientTick(MinecraftClient mc)
                     RecipePattern recipe = RecipeStorage.getInstance().getSelectedRecipe();
 
                     CraftingRecipe bookRecipe = InventoryUtils.getBookRecipeFromPattern(recipe);
-                    StonecuttingRecipe stonecuttingRecipe = InventoryUtils.getStonecuttingRecipeFromPattern(recipe);
-                    if (bookRecipe != null && !bookRecipe.isIgnoredInRecipeBook()) { // Use recipe book if possible
+                    int stonecuttingRecipeIndex = InventoryUtils.getStonecuttingRecipeFromPattern(recipe);
+                    if (!(gui instanceof StonecutterScreen) && bookRecipe != null && !bookRecipe.isIgnoredInRecipeBook()) { // Use recipe book if possible
                         // System.out.println("recipe");
                         int option = InventoryUtils.checkRecipeEnough(recipe, gui);
                         if(option > 0) {
                             mc.interactionManager.clickRecipe(gui.getScreenHandler().syncId, bookRecipe, option > 1);
                         }
                     }
-                    else if(stonecuttingRecipe != null && gui instanceof StonecutterScreen) {
-                        mc.interactionManager.clickRecipe(gui.getScreenHandler().syncId, stonecuttingRecipe, true);
-                    }
                     else {
-                        // System.out.println("move");
                         InventoryUtils.tryMoveItemsToFirstCraftingGrid(recipe, gui, true);
+                        if(stonecuttingRecipeIndex != -1 && gui instanceof StonecutterScreen) {
+                            mc.interactionManager.clickButton((gui.getScreenHandler()).syncId, stonecuttingRecipeIndex);
+                        }
                     }
 
                     if(recipe.getResult().isStackable()) {

diff --git a/src/main/java/fi/dy/masa/itemscroller/recipes/RecipePattern.java b/src/main/java/fi/dy/masa/itemscroller/recipes/RecipePattern.java
@@ -22,7 +22,7 @@ public class RecipePattern
     private ItemStack[] recipe = new ItemStack[9];
     public CraftingRecipe cachedRecipeFromBook = null;
 
-    public StonecuttingRecipe cachedRecipeFromStonecutting = null;
+    public int cachedRecipeFromStonecutting = -1;
     private int maxCraftAmount = 64;
     private HashSet<Item> recipeRemainders = new HashSet<Item>();
 

diff --git a/src/main/java/fi/dy/masa/itemscroller/util/InventoryUtils.java b/src/main/java/fi/dy/masa/itemscroller/util/InventoryUtils.java
@@ -1339,8 +1339,8 @@ public static CraftingRecipe getBookRecipeFromPattern(RecipePattern recipe) {
         return null;
     }
 
-    public static StonecuttingRecipe getStonecuttingRecipeFromPattern(RecipePattern recipe) {
-        if(recipe.cachedRecipeFromStonecutting != null) {
+    public static int getStonecuttingRecipeFromPattern(RecipePattern recipe) {
+        if(recipe.cachedRecipeFromStonecutting != -1) {
             return recipe.cachedRecipeFromStonecutting;
         }
         else {
@@ -1354,14 +1354,15 @@ public static StonecuttingRecipe getStonecuttingRecipeFromPattern(RecipePattern
                 search.setStack(i, items[i]);
             }
             List<StonecuttingRecipe> inputRecipes = recipeManager.getAllMatches(RecipeType.STONECUTTING, search, mc.world);
-            for(StonecuttingRecipe inputRecipe : inputRecipes) {
+            for(int i=0; i<inputRecipes.size(); ++i) {
+                StonecuttingRecipe inputRecipe = inputRecipes.get(i);
                 if(inputRecipe.getOutput().getItem() == recipe.getResult().getItem()) {
-                    recipe.cachedRecipeFromStonecutting = inputRecipe;
-                    return inputRecipe;
+                    recipe.cachedRecipeFromStonecutting = i;
+                    return recipe.cachedRecipeFromStonecutting;
                 }
             }
         }
-        return null;
+        return -1;
     }
 
     public static void craftEverythingPossibleWithCurrentRecipe(RecipePattern recipe,