From bd3a92994eee0c7beb68cbfacd2f958a751bd646 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Wed, 27 Dec 2023 17:06:21 +0100 Subject: [PATCH 1/3] Fix 2x2 Integrated Crafting recipes from Machine Reader failing Closes CyclopsMC/IntegratedDynamics#1316 --- .../processoverride/CraftingProcessOverrideCraftingTable.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java b/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java index 47456d2c..c256e190 100644 --- a/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java +++ b/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java @@ -50,6 +50,10 @@ public boolean craft(Function, PartPos> targetGetter, CraftingGrid grid = new CraftingGrid(ingredients, 3, 3); return CraftingHelpers.findServerRecipe(RecipeType.CRAFTING, grid, target.getPos().getLevel(true)) + .or(() -> { + CraftingGrid gridSmall = new CraftingGrid(ingredients, 2, 2); + return CraftingHelpers.findServerRecipe(RecipeType.CRAFTING, gridSmall, target.getPos().getLevel(true)); + }) .map(recipe -> { ItemStack result = recipe.assemble(grid); From 9bc2f4df1723c0972072c6dc8fdf571e29b23ad7 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Wed, 27 Dec 2023 17:11:37 +0100 Subject: [PATCH 2/3] Bump mod version --- gradle.properties | 2 +- resources/changelog/1.18.2-1.1.6.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 resources/changelog/1.18.2-1.1.6.txt diff --git a/gradle.properties b/gradle.properties index a5f0a1e6..1ad34e62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=1.1.5 +mod_version=1.1.6 minecraft_version=1.18.2 forge_version=40.0.54 cyclopscore_version=1.13.4-158 diff --git a/resources/changelog/1.18.2-1.1.6.txt b/resources/changelog/1.18.2-1.1.6.txt new file mode 100644 index 00000000..ab019480 --- /dev/null +++ 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 + From 7b341b48834be4c607d60eed4a528c1cca34cf99 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Wed, 27 Dec 2023 17:13:37 +0100 Subject: [PATCH 3/3] Bump mod version --- gradle.properties | 2 +- resources/changelog/1.19.2-1.1.6.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 resources/changelog/1.19.2-1.1.6.txt diff --git a/gradle.properties b/gradle.properties index 0739c13e..a23abd81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=1.1.5 +mod_version=1.1.6 minecraft_version=1.19.2 forge_version=43.0.8 cyclopscore_version=1.17.0-237 diff --git a/resources/changelog/1.19.2-1.1.6.txt b/resources/changelog/1.19.2-1.1.6.txt new file mode 100644 index 00000000..83dd2b00 --- /dev/null +++ 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 +