fix: Fix crafting refill on 2x2 grids not filling correctly and voiding one item (#261)

* fix: Fix items being put into wrong slots on 2x2 grid refill #255

* fix: Do not try to refill when the grid does not support the recipe size

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/craftingtweaks/api/RecipeMapper.java

@@ -7,6 +7,17 @@
 import java.util.Optional;
 
 public interface RecipeMapper<T extends Recipe<?>> {
-    int mapToMatrixSlot(T recipe, int ingredientIndex);
+    /**
+     * @deprecated Use {@link #mapToMatrixSlot(Recipe, int, int)} which supports a custom grid width instead.
+     */
+    @Deprecated
+    default int mapToMatrixSlot(T recipe, int ingredientIndex) {
+        return mapToMatrixSlot(recipe, 3, ingredientIndex);
+    }
+
+    default int mapToMatrixSlot(T recipe, int gridWidth, int ingredientIndex) {
+        return mapToMatrixSlot(recipe, ingredientIndex);
+    }
+
     List<Optional<Ingredient>> getIngredients(T recipe);
 }

common/src/main/java/net/blay09/mods/craftingtweaks/api/impl/DefaultGridRefillHandler.java

@@ -4,8 +4,8 @@
 import net.blay09.mods.craftingtweaks.api.CraftingGrid;
 import net.blay09.mods.craftingtweaks.api.CraftingTweaksAPI;
 import net.blay09.mods.craftingtweaks.api.GridRefillHandler;
-import net.blay09.mods.craftingtweaks.crafting.CraftingContext;
 import net.blay09.mods.craftingtweaks.crafting.ContainerIngredientProvider;
+import net.blay09.mods.craftingtweaks.crafting.CraftingContext;
 import net.blay09.mods.craftingtweaks.crafting.IngredientToken;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -27,23 +27,32 @@ public void refillRecipe(CraftingGrid grid, Player player, AbstractContainerMenu
             return;
         }
 
+        // TODO Would be nice if our Grid API had info on width/height so this didn't need to be hardcoded
+        final var gridSize = grid.getGridSize(player, menu);
+        final var gridWidth = gridSize == 4 ? 2 : 3;
+        final var gridHeight = gridSize == 4 ? 2 : 3;
+
         final var recipe = recipeHolder.value();
         final var context = new CraftingContext(List.of(new ContainerIngredientProvider(player.getInventory())));
         final var operation = context.createOperation((RecipeHolder<Recipe<?>>) recipeHolder).prepare();
         if (!operation.canCraft()) {
             return;
         }
 
+        final var matrixMapper = CraftingTweaksAPI.getRecipeMapper(recipe.getClass());
+        if (matrixMapper.getIngredients(recipe).size() > gridSize) {
+            return;
+        }
+
         int operations = 0;
         outer:
         do {
             final var ingredientTokens = operation.getIngredientTokens();
-            final var matrixMapper = CraftingTweaksAPI.getRecipeMapper(recipe.getClass());
 
             final var matrixDiff = new HashMap<Integer, IngredientToken>();
             for (int i = 0; i < ingredientTokens.size(); i++) {
                 final var ingredientToken = ingredientTokens.get(i);
-                var matrixSlot = matrixMapper.mapToMatrixSlot(recipe, i);
+                var matrixSlot = matrixMapper.mapToMatrixSlot(recipe, gridWidth, i);
                 if (matrixSlot != -1) {
                     final var itemStack = ingredientToken.peek();
                     final var slotStack = craftMatrix.getItem(matrixSlot);

common/src/main/java/net/blay09/mods/craftingtweaks/crafting/ShapedRecipeMatrixMapper.java

@@ -9,15 +9,15 @@
 
 public class ShapedRecipeMatrixMapper implements RecipeMapper<ShapedRecipe> {
     @Override
-    public int mapToMatrixSlot(ShapedRecipe recipe, int ingredientIndex) {
+    public int mapToMatrixSlot(ShapedRecipe recipe, int gridWidth, int ingredientIndex) {
         final int recipeWidth = recipe.getWidth();
         final int origX = ingredientIndex % recipeWidth;
         final int origY = ingredientIndex / recipeWidth;
 
-        // Offset to center the recipe if its width is 1
-        final int offsetX = recipeWidth == 1 ? 1 : 0;
+        // Offset to center the recipe if its width is 1 in a 3-wide grid
+        final int offsetX = gridWidth == 3 && recipeWidth == 1 ? 1 : 0;
 
-        return origY * 3 + origX + offsetX;
+        return origY * gridWidth + origX + offsetX;
     }
 
     @Override

common/src/main/java/net/blay09/mods/craftingtweaks/crafting/ShapelessRecipeMatrixMapper.java

@@ -10,7 +10,7 @@
 
 public class ShapelessRecipeMatrixMapper implements RecipeMapper<ShapelessRecipe> {
     @Override
-    public int mapToMatrixSlot(ShapelessRecipe recipe, int ingredientIndex) {
+    public int mapToMatrixSlot(ShapelessRecipe recipe, int gridWidth, int ingredientIndex) {
         return ingredientIndex;
     }