Skip to content

Commit c78b765

Browse files
committed
Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21-lts
2 parents 8fd1d79 + dec4ef9 commit c78b765

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

CHANGELOG-1.20.1.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
# Changelog for Minecraft 1.20.1
22
All notable changes to this project will be documented in this file.
33

4+
<a name="1.20.1-1.4.4"></a>
5+
## [1.20.1-1.4.4](/compare/1.20.1-1.4.3...1.20.1-1.4.4) - 2026-02-12 16:47:55
6+
7+
8+
### Fixed
9+
* Fix crash on invalid Stone Cutter recipes, Closes #178
10+
411
<a name="1.20.1-1.4.3"></a>
5-
## [1.20.1-1.4.3](/compare/1.20.1-1.4.2...1.20.1-1.4.3) - 2026-02-01 14:22:50
12+
## [1.20.1-1.4.3](/compare/1.20.1-1.4.2...1.20.1-1.4.3) - 2026-02-01 14:22:50 +0100
613

714

815
### Fixed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
As always, don't forget to backup your world before updating!
2+
Requires CyclopsCore version 1.18.4 or higher.
3+
4+
Fixes:
5+
* Fix crash on invalid Stone Cutter recipes, Closes #178

src/main/java/org/cyclops/integratedcrafting/core/CraftingJobHandler.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,11 @@ protected boolean insertCrafting(PartPos target, IMixedIngredients ingredients,
563563
// First check our crafting overrides
564564
for (ICraftingProcessOverride craftingProcessOverride : this.craftingProcessOverrides) {
565565
if (craftingProcessOverride.isApplicable(target)) {
566-
return craftingProcessOverride.craft(targetGetter, ingredients, recipe, this.resultsSink, craftingJob, simulate);
566+
try {
567+
return craftingProcessOverride.craft(targetGetter, ingredients, recipe, this.resultsSink, craftingJob, simulate);
568+
} catch (IllegalArgumentException e) {
569+
return false;
570+
}
567571
}
568572
}
569573

@@ -577,7 +581,7 @@ protected void insertLoopNonBlocking(INetwork network, int channel, PartPos targ
577581
IRecipeDefinition recipe = craftingJob.getRecipe();
578582
IMixedIngredients ingredientsSimulated = CraftingHelpers.getRecipeInputsFromCraftingJobBuffer(craftingJob,
579583
recipe, true, 1);
580-
if (ingredientsSimulated == null ||!insertCrafting(targetPos, ingredientsSimulated, recipe, craftingJob, network, channel, true)) {
584+
if (ingredientsSimulated == null || !insertCrafting(targetPos, ingredientsSimulated, recipe, craftingJob, network, channel, true)) {
581585
break;
582586
}
583587
if (!consumeAndInsertCrafting(true, network, channel, targetPos, craftingJob)) {

0 commit comments

Comments
 (0)