Check if item is damageable (Fixes #118)

Mrbysco · Jan 18, 2025 · 2180b53 · 2180b53
1 parent fbfe8b3
commit 2180b53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/mrbysco/forcecraft/items/infuser/IForceChargingTool.java b/src/main/java/com/mrbysco/forcecraft/items/infuser/IForceChargingTool.java
@@ -7,6 +7,7 @@ public interface IForceChargingTool {
 	static final int FORCE_DMG_RATIO = 25;
 
 	default int damageItem(ItemStack stack, int amount) {
+		if (!stack.isDamageableItem()) return 0;
 		int forceDrain = amount * FORCE_DMG_RATIO;
 
 		ForceToolData fd = new ForceToolData(stack);

diff --git a/src/main/java/com/mrbysco/forcecraft/recipe/TransmutationRecipe.java b/src/main/java/com/mrbysco/forcecraft/recipe/TransmutationRecipe.java
@@ -28,8 +28,8 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.Map;
 
 public class TransmutationRecipe implements CraftingRecipe {
@@ -157,7 +157,8 @@ public NonNullList<ItemStack> getRemainingItems(CraftingContainer inv) {
 				if (itemstack1.getItem().getDamage(itemstack1) >= itemstack1.getMaxDamage()) {
 					itemstack1.shrink(1);
 				} else {
-					itemstack1.setDamageValue(itemstack1.getDamageValue() + damage);
+					if (damage > 0)
+						itemstack1.setDamageValue(itemstack1.getDamageValue() + damage);
 					nonnulllist.set(i, itemstack1);
 				}
 				continue;