Fiix some missing checks for the tool having durability for durabilli…

…ty related stuff
SlimeKnights · Feb 3, 2023 · f85de53 · f85de53
1 parent c59da4d
commit f85de53
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/unbreakable.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/unbreakable.json
@@ -18,7 +18,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "abilities": 1

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/unbreakable.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/unbreakable.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "abilities": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/diamond.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/diamond.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/emerald.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/emerald.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "upgrades": 1

diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/netherite.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/netherite.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/diamond.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/diamond.json
@@ -6,7 +6,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/emerald.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/emerald.json
@@ -6,7 +6,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/netherite.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/netherite.json
@@ -6,7 +6,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable"
+    "tag": "tconstruct:modifiable/durability"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/main/java/slimeknights/tconstruct/library/tools/helper/TooltipUtil.java b/src/main/java/slimeknights/tconstruct/library/tools/helper/TooltipUtil.java
@@ -345,7 +345,7 @@ public static void addModifierNames(ItemStack stack, IToolStackView tool, List<C
    */
   public static void getDefaultInfo(ItemStack stack, IToolStackView tool, List<Component> tooltips) {
     // shows as broken when broken, hold shift for proper durability
-    if (tool.getItem().canBeDepleted() && !tool.isUnbreakable()) {
+    if (tool.getItem().canBeDepleted() && !tool.isUnbreakable() && tool.hasTag(TinkerTags.Items.DURABILITY)) {
       tooltips.add(TooltipBuilder.formatDurability(tool.getCurrentDurability(), tool.getStats().getInt(ToolStats.DURABILITY), true));
     }
     // modifier tooltip

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -202,12 +202,14 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                                     .save(consumer, prefix(TinkerModifiers.overforced, upgradeFolder));
     // gems are special, I'd like them to be useful on all types of tools
     ModifierRecipeBuilder.modifier(ModifierIds.emerald)
+                         .setTools(TinkerTags.Items.DURABILITY)
                          .addInput(Tags.Items.GEMS_EMERALD)
                          .setMaxLevel(1)
                          .setSlots(SlotType.UPGRADE, 1)
                          .saveSalvage(consumer, prefix(ModifierIds.emerald, upgradeSalvage))
                          .save(consumer, prefix(ModifierIds.emerald, upgradeFolder));
     ModifierRecipeBuilder.modifier(ModifierIds.diamond)
+                         .setTools(TinkerTags.Items.DURABILITY)
                          .addInput(Tags.Items.GEMS_DIAMOND)
                          .setMaxLevel(1)
                          .setSlots(SlotType.UPGRADE, 1)
@@ -224,6 +226,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .saveSalvage(consumer, prefix(TinkerModifiers.soulbound, upgradeSalvage))
                          .save(consumer, prefix(TinkerModifiers.soulbound, upgradeFolder));
     ModifierRecipeBuilder.modifier(ModifierIds.netherite)
+                         .setTools(TinkerTags.Items.DURABILITY)
                          .addInput(Tags.Items.INGOTS_NETHERITE)
                          .setMaxLevel(1)
                          .setSlots(SlotType.UPGRADE, 1)
@@ -1281,6 +1284,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
 
     // unbreakable
     ModifierRecipeBuilder.modifier(TinkerModifiers.unbreakable)
+                         .setTools(TinkerTags.Items.DURABILITY)
                          .addInput(Items.SHULKER_SHELL)
                          .addInput(Items.DRAGON_BREATH)
                          .addInput(Items.SHULKER_SHELL)