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

CyclopsMC · Feb 12, 2023 · 85b23ef · 85b23ef
2 parents fa15b8f + 05dd969
commit 85b23ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/resources/changelog/1.18.2-0.2.4.txt b/resources/changelog/1.18.2-0.2.4.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.13.4 or higher.
+
+Fixes:
+* Fix input not consumed if output can not fully fit, Closes #31
diff --git a/src/api/java/org/cyclops/commoncapabilities/api b/src/api/java/org/cyclops/commoncapabilities/api
diff --git a/src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java b/src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java
@@ -143,7 +143,10 @@ public boolean craft(boolean simulate) {
 
         // Determine output
         if(chosenPossibility != null && !itemStack.isEmpty()
-                && addItemStackForOutput(level, targetPos, targetSide, outputProviders, itemStack, simulate)) {
+                && addItemStackForOutput(level, targetPos, targetSide, outputProviders, itemStack, true)) {
+            if (!simulate) {
+                addItemStackForOutput(level, targetPos, targetSide, outputProviders, itemStack, simulate);
+            }
             chosenPossibility.handleRemainingItems(level, inputSide, simulate);
             return true;
         }
+46 −2		capability/recipehandler/IRecipeDefinition.java
+32 −2		capability/recipehandler/RecipeDefinition.java