Fix small recipes with reusable items failing, Closes #42

Author: rubensworks

gradle.properties

@@ -21,8 +21,8 @@ curseforge_project_id=233151
 modrinth_project_id=GTi2kHAW
 
 # Fabric
-fabric_version=0.102.1+1.21.1
-fabric_loader_version=0.15.11
+fabric_version=0.110.0+1.21.1
+fabric_loader_version=0.16.7
 # Dependencies
 fabric_forgeconfigapiport_version=21.1.0
 

loader-common/src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java

@@ -216,14 +216,17 @@ public ItemStack getOutput(Level level) {
          */
         public boolean handleRemainingItems(Level level, Direction inputSide, boolean simulate) {
             Recipe recipe = getRecipe(level);
-            CraftingInput craftInput = inventoryCrafting.asCraftInput();
+            CraftingInput.Positioned craftInputPositioned = inventoryCrafting.asPositionedCraftInput();
+            CraftingInput craftInput = craftInputPositioned.input();
+            int left = craftInputPositioned.left();
+            int top = craftInputPositioned.top();
             NonNullList<ItemStack> remainingStacks = recipe.getRemainingItems(craftInput);
             for(int r = 0; r < 3; r++) {
                 for(int c = 0; c < 3; c++) {
                     int i = r * 3 + c;
 
                     ItemStack originalStack = inventoryCrafting.getItem(i);
-                    ItemStack remainingStack = r < craftInput.width() && c < craftInput.height() ? remainingStacks.get(r * craftInput.height() + c) : ItemStack.EMPTY;
+                    ItemStack remainingStack = r >= top && r < craftInput.width() && c >= left && c < craftInput.height() ? remainingStacks.get((r - top) * craftInput.height() + c - left) : ItemStack.EMPTY;
                     if(originalStack != null && !originalStack.isEmpty()) {
                         if (providers[i] != null) {
                             // Consume one item from input

loader-common/src/main/java/org/cyclops/structuredcrafting/gametest/GameTestsCommon.java

@@ -7,6 +7,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
@@ -235,6 +236,46 @@ public void testCraftFromChestsToChestStairs(GameTestHelper helper) {
         });
     }
 
+    @GameTest(template = TEMPLATE_EMPTY)
+    public void testCraftFromChestsToChestCakeReusable(GameTestHelper helper) {
+        helper.setBlock(POS.offset(2, 2, 2), RegistryEntries.BLOCK_STRUCTURED_CRAFTER.value()
+                .defaultBlockState()
+                .setValue(BlockStructuredCrafter.FACING, Direction.NORTH));
+
+        // Define inputs
+        setChestWithItem(helper, POS.offset(3, 3, 3), new ItemStack(Items.MILK_BUCKET));
+        setChestWithItem(helper, POS.offset(2, 3, 3), new ItemStack(Items.MILK_BUCKET));
+        setChestWithItem(helper, POS.offset(1, 3, 3), new ItemStack(Items.MILK_BUCKET));
+        setChestWithItem(helper, POS.offset(3, 2, 3), new ItemStack(Items.SUGAR));
+        setChestWithItem(helper, POS.offset(2, 2, 3), new ItemStack(Items.EGG));
+        setChestWithItem(helper, POS.offset(1, 2, 3), new ItemStack(Items.SUGAR));
+        setChestWithItem(helper, POS.offset(3, 1, 3), new ItemStack(Items.WHEAT));
+        setChestWithItem(helper, POS.offset(2, 1, 3), new ItemStack(Items.WHEAT));
+        setChestWithItem(helper, POS.offset(1, 1, 3), new ItemStack(Items.WHEAT));
+
+        // Set output chest
+        helper.setBlock(POS.offset(2, 2, 1), Blocks.CHEST);
+
+        // Activate crafter
+        helper.setBlock(POS.offset(1, 2, 2), Blocks.REDSTONE_BLOCK);
+
+        helper.succeedWhen(() -> {
+            // Result
+            assertChestContains(helper, POS.offset(2, 2, 1), new ItemStack(Blocks.CAKE));
+
+            // Inputs must be consumed
+            assertChestContains(helper, POS.offset(3, 3, 3), new ItemStack(Items.BUCKET));
+            assertChestContains(helper, POS.offset(2, 3, 3), new ItemStack(Items.BUCKET));
+            assertChestContains(helper, POS.offset(1, 3, 3), new ItemStack(Items.BUCKET));
+            assertChestEmpty(helper, POS.offset(3, 2, 3));
+            assertChestEmpty(helper, POS.offset(2, 2, 3));
+            assertChestEmpty(helper, POS.offset(1, 2, 3));
+            assertChestEmpty(helper, POS.offset(3, 1, 3));
+            assertChestEmpty(helper, POS.offset(2, 1, 3));
+            assertChestEmpty(helper, POS.offset(1, 1, 3));
+        });
+    }
+
     protected void setChestWithItem(GameTestHelper helper, BlockPos pos, ItemStack itemStack) {
         helper.setBlock(pos, Blocks.CHEST);
         ChestBlockEntity chest = helper.getBlockEntity(pos);

loader-fabric/build.gradle

@@ -21,6 +21,9 @@ dependencies {
     }
 
     modApi "fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${fabric_forgeconfigapiport_version}"
+
+//    modImplementation files("libs/moonlight-1.21-2.18.13-fabric.jar")
+//    modImplementation files("libs/supplementaries-1.21-3.1.7-fabric.jar")
 }
 
 task publishCurseForge(type: TaskPublishCurseForge) {