Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20

CyclopsMC · Dec 27, 2023 · 9090007 · 9090007
2 parents 5dd5dc2 + 7b341b4
commit 9090007
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/resources/changelog/1.18.2-1.1.6.txt b/resources/changelog/1.18.2-1.1.6.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.13.4 or higher.
+
+Fixes:
+* Fix 2x2 Integrated Crafting recipes from Machine Reader failing, Closes CyclopsMC/IntegratedDynamics#1316
+
diff --git a/resources/changelog/1.19.2-1.1.6.txt b/resources/changelog/1.19.2-1.1.6.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix 2x2 Integrated Crafting recipes from Machine Reader failing, Closes CyclopsMC/IntegratedDynamics#1316
+
diff --git a/...ntegratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java b/...ntegratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java
@@ -52,6 +52,10 @@ public boolean craft(Function<IngredientComponent<?, ?>, PartPos> targetGetter,
         Level level = target.getPos().getLevel(true);
 
         return CraftingHelpers.findServerRecipe(RecipeType.CRAFTING, grid, level)
+                .or(() -> {
+                    CraftingGrid gridSmall = new CraftingGrid(ingredients, 2, 2);
+                    return CraftingHelpers.findServerRecipe(RecipeType.CRAFTING, gridSmall, level);
+                })
                 .map(recipe -> {
                     ItemStack result = recipe.assemble(grid, level.registryAccess());