Added unarmed tag, to make it easier to make non-chestplates unarmed

I am imaginging an addon adds gauntlets and removes chestplates from the unarmed tag If I missed anything and you wish to add this feature, make an issue or let me know on discord
SlimeKnights · May 3, 2022 · b805d1f · b805d1f
1 parent 59c638f
commit b805d1f
Show file tree

Hide file tree

Showing 43 changed files with 57 additions and 53 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/melting_unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/melting_unarmed.json
@@ -18,7 +18,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "abilities": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/unarmed.json
@@ -18,7 +18,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "abilities": 1

diff --git a/...ated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/dual_wielding.json b/...ated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/dual_wielding.json
@@ -2,14 +2,9 @@
   "type": "tconstruct:modifier_salvage",
   "tools": {
     "type": "forge:difference",
-    "base": [
-      {
-        "tag": "tconstruct:modifiable/melee"
-      },
-      {
-        "tag": "tconstruct:modifiable/armor/chestplate"
-      }
-    ],
+    "base": {
+      "tag": "tconstruct:modifiable/melee"
+    },
     "subtracted": {
       "item": "tconstruct:dagger"
     }

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/melting.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/melting.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee_or_harvest"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/unarmed.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "abilities": 1

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/antiaquatic.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/antiaquatic.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...ated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/bane_of_sssss.json b/...ated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/bane_of_sssss.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/cooling.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/cooling.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/experienced.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/experienced.json
@@ -8,7 +8,7 @@
       "tag": "tconstruct:modifiable/armor/leggings"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/fiery.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/fiery.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/killager.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/killager.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_1.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_1.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_2.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_2.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_3.json b/...ed/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/looting_level_3.json
@@ -1,7 +1,7 @@
 {
   "type": "tconstruct:modifier_salvage",
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/necrotic.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/necrotic.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/padded.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/padded.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/severing.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/severing.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/sharpness.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/sharpness.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/smite.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/smite.json
@@ -5,7 +5,7 @@
       "tag": "tconstruct:modifiable/melee"
     },
     {
-      "tag": "tconstruct:modifiable/armor/chestplate"
+      "tag": "tconstruct:modifiable/unarmed"
     }
   ],
   "slots": {

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/antiaquatic_unarmed.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/antiaquatic_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 20,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...ated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/bane_of_sssss_unarmed.json b/...ated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/bane_of_sssss_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 15,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/cooling_unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/cooling_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 25,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/experienced_unarmed.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/experienced_unarmed.json
@@ -12,7 +12,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/fiery_unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/fiery_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 25,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...esources/data/tconstruct/recipes/tools/modifiers/upgrade/killager_from_block_unarmed.json b/...esources/data/tconstruct/recipes/tools/modifiers/upgrade/killager_from_block_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 9,
   "needed_per_level": 45,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...resources/data/tconstruct/recipes/tools/modifiers/upgrade/killager_from_dust_unarmed.json b/...resources/data/tconstruct/recipes/tools/modifiers/upgrade/killager_from_dust_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 45,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/looting_level_1.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/looting_level_1.json
@@ -25,7 +25,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/looting_level_2.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/looting_level_2.json
@@ -18,7 +18,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/looting_level_3.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/looting_level_3.json
@@ -18,7 +18,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/necrotic_unarmed.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/necrotic_unarmed.json
@@ -12,7 +12,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/padded_unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/padded_unarmed.json
@@ -12,7 +12,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/severing_unarmed.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/severing_unarmed.json
@@ -15,7 +15,7 @@
     }
   ],
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...sources/data/tconstruct/recipes/tools/modifiers/upgrade/sharpness_from_block_unarmed.json b/...sources/data/tconstruct/recipes/tools/modifiers/upgrade/sharpness_from_block_unarmed.json
@@ -7,7 +7,7 @@
   "needed_per_level": 36,
   "leftover": "minecraft:quartz",
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/...sources/data/tconstruct/recipes/tools/modifiers/upgrade/sharpness_from_shard_unarmed.json b/...sources/data/tconstruct/recipes/tools/modifiers/upgrade/sharpness_from_shard_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 36,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/smite_unarmed.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/smite_unarmed.json
@@ -6,7 +6,7 @@
   "amount_per_item": 1,
   "needed_per_level": 5,
   "tools": {
-    "tag": "tconstruct:modifiable/armor/chestplate"
+    "tag": "tconstruct:modifiable/unarmed"
   },
   "slots": {
     "upgrades": 1

diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/melee_or_unarmed.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/melee_or_unarmed.json
@@ -2,6 +2,6 @@
   "replace": false,
   "values": [
     "#tconstruct:modifiable/melee",
-    "#tconstruct:modifiable/armor/chestplate"
+    "#tconstruct:modifiable/unarmed"
   ]
 }
diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/unarmed.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/unarmed.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#tconstruct:modifiable/armor/chestplate"
+  ]
+}
diff --git a/src/main/java/slimeknights/tconstruct/common/TinkerTags.java b/src/main/java/slimeknights/tconstruct/common/TinkerTags.java
@@ -322,6 +322,8 @@ private static void init() {}
     public static final TagKey<Item> CHESTPLATES = tag("modifiable/armor/chestplate");
     /** Modifiable items that are worn as helmets */
     public static final TagKey<Item> HELMETS = tag("modifiable/armor/helmets");
+    /** Modifiable items that boost unarmed attack damage. By default this is just chestplates, but added as a tag to make it easier for adds to change */
+    public static final TagKey<Item> UNARMED = tag("modifiable/unarmed");
     // /** Modifiable items that support ranged attacks, such as bows */
     // public static final TagKey<Item> RANGED = tag("modifiable/ranged");
 

diff --git a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java
@@ -58,6 +58,7 @@
 import static slimeknights.tconstruct.common.TinkerTags.Items.STONE_HARVEST;
 import static slimeknights.tconstruct.common.TinkerTags.Items.SWORD;
 import static slimeknights.tconstruct.common.TinkerTags.Items.TWO_HANDED;
+import static slimeknights.tconstruct.common.TinkerTags.Items.UNARMED;
 
 @SuppressWarnings("unchecked")
 public class ItemTagProvider extends ItemTagsProvider {
@@ -228,7 +229,8 @@ private void addTools() {
     this.tag(MELEE).addTag(MELEE_PRIMARY).addTag(SWORD);
     // modifier helper tags
     this.tag(MELEE_OR_HARVEST).addTag(MELEE).addTag(HARVEST);
-    this.tag(MELEE_OR_UNARMED).addTag(MELEE).addTag(CHESTPLATES);
+    this.tag(MELEE_OR_UNARMED).addTag(MELEE).addTag(UNARMED);
+    this.tag(UNARMED).addTag(CHESTPLATES);
     this.tag(HELD).addTag(ONE_HANDED).addTag(TWO_HANDED);
     this.tag(INTERACTABLE).addTag(HELD).addTag(CHESTPLATES);
     this.tag(ARMOR).addTag(BOOTS).addTag(LEGGINGS).addTag(CHESTPLATES).addTag(HELMETS);

diff --git a/...limeknights/tconstruct/library/recipe/modifiers/adding/AbstractModifierRecipeBuilder.java b/...limeknights/tconstruct/library/recipe/modifiers/adding/AbstractModifierRecipeBuilder.java
@@ -180,10 +180,10 @@ private void writeCommon(JsonObject json, @Nullable Boolean unarmed) {
     }
     // if true, only chestplates
     if (unarmed == Boolean.TRUE) {
-      ingredient = Ingredient.of(TinkerTags.Items.CHESTPLATES);
+      ingredient = Ingredient.of(TinkerTags.Items.UNARMED);
       // if null, both
     } else if (unarmed == null) {
-      ingredient = CompoundIngredient.of(ingredient, Ingredient.of(TinkerTags.Items.CHESTPLATES));
+      ingredient = CompoundIngredient.of(ingredient, Ingredient.of(TinkerTags.Items.UNARMED));
     }
     json.add("tools", ingredient.toJson());
     if (maxToolSize != ITinkerStationRecipe.DEFAULT_TOOL_STACK_SIZE) {

diff --git a/src/main/java/slimeknights/tconstruct/library/tools/helper/TooltipUtil.java b/src/main/java/slimeknights/tconstruct/library/tools/helper/TooltipUtil.java
@@ -356,7 +356,7 @@ public static List<Component> getArmorStats(IToolStackView tool, @Nullable Playe
       builder.addOptional(ToolStats.ARMOR_TOUGHNESS);
       builder.addOptional(ToolStats.KNOCKBACK_RESISTANCE, 10f);
     }
-    if (tool.hasTag(TinkerTags.Items.CHESTPLATES) && tool.getModifierLevel(TinkerModifiers.unarmed.getId()) > 0) {
+    if (tool.hasTag(TinkerTags.Items.UNARMED) && tool.getModifierLevel(TinkerModifiers.unarmed.getId()) > 0) {
       builder.addWithAttribute(ToolStats.ATTACK_DAMAGE, Attributes.ATTACK_DAMAGE);
     }