Merge branch 'refs/heads/1.19' into 1.20

# Conflicts: # src/main/java/folk/sisby/tinkerers_smithing/recipe/SacrificeUpgradeRecipe.java # src/main/java/folk/sisby/tinkerers_smithing/recipe/SmithingUpgradeRecipe.java
sisby-folk · Aug 26, 2024 · 2d35962 · 2d35962
2 parents 31b4ea4 + 694eacb
commit 2d35962
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/folk/sisby/tinkerers_smithing/recipe/SacrificeUpgradeRecipe.java b/src/main/java/folk/sisby/tinkerers_smithing/recipe/SacrificeUpgradeRecipe.java
@@ -46,8 +46,9 @@ public static int resultDamage(Item resultItem, int additionUnits, int resultUni
  public ItemStack craft(Inventory inventory, DynamicRegistryManager registryManager) {
  ItemStack output = super.craft(inventory, registryManager);
  ItemStack addition = inventory.getStack(2);
- output.setDamage(resultDamage(output.getItem(), additionUnits, resultUnits, addition.getDamage(), addition.getMaxDamage()));
- if (output.getDamage() > output.getMaxDamage()) return ItemStack.EMPTY;
+ int damage = resultDamage(output.getItem(), additionUnits, resultUnits, addition.getDamage(), addition.getMaxDamage());
+ if (damage > output.getMaxDamage()) return ItemStack.EMPTY;
+ output.setDamage(damage);
  return output;
  }
 

diff --git a/src/main/java/folk/sisby/tinkerers_smithing/recipe/SmithingUpgradeRecipe.java b/src/main/java/folk/sisby/tinkerers_smithing/recipe/SmithingUpgradeRecipe.java
@@ -43,8 +43,9 @@ public static int resultDamage(Item resultItem, int additionCount, int usedCount
  public ItemStack craft(Inventory inventory, DynamicRegistryManager registryManager) {
  ItemStack output = super.craft(inventory, registryManager);
  int usedCount = Math.min(additionCount, inventory.getStack(2).getCount());
- output.setDamage(resultDamage(output.getItem(), additionCount, usedCount));
- if (output.getDamage() > output.getMaxDamage()) return ItemStack.EMPTY;
+ int damage = resultDamage(output.getItem(), additionCount, usedCount);
+ if (damage > output.getMaxDamage()) return ItemStack.EMPTY;
+ output.setDamage(damage);
  return output;
  }