Experimental: disable two handed

Want to see if I like the change before fully disabling two handed Two handed ended up feeling somewhat arbitrary, that broad tools cannot use the offhand. Going to do some playtesting without it Datapacks can still re-enable it for now
SlimeKnights · May 6, 2022 · 6348004 · 6348004
1 parent c97c371
commit 6348004
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/.../resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/offhanded_level_1.json b/.../resources/data/tconstruct/recipes/tools/modifiers/salvage/upgrade/offhanded_level_1.json
@@ -3,9 +3,6 @@
   "tools": {
     "tag": "tconstruct:modifiable/held"
   },
-  "slots": {
-    "upgrades": 1
-  },
   "modifier": "tconstruct:offhanded",
   "min_level": 1,
   "max_level": 1

diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/offhanded_level_1.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/offhanded_level_1.json
@@ -14,9 +14,6 @@
   "tools": {
     "tag": "tconstruct:modifiable/held"
   },
-  "slots": {
-    "upgrades": 1
-  },
   "result": {
     "name": "tconstruct:offhanded",
     "level": 1

diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/one_handed.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/one_handed.json
@@ -2,12 +2,18 @@
   "replace": false,
   "values": [
     "tconstruct:pickaxe",
+    "tconstruct:sledge_hammer",
+    "tconstruct:vein_hammer",
     "tconstruct:mattock",
     "tconstruct:pickadze",
+    "tconstruct:excavator",
     "tconstruct:hand_axe",
+    "tconstruct:broad_axe",
     "tconstruct:kama",
+    "tconstruct:scythe",
     "tconstruct:dagger",
     "tconstruct:sword",
+    "tconstruct:cleaver",
     "tconstruct:flint_and_brick"
   ]
 }
diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/two_handed.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/two_handed.json
@@ -1,11 +1,4 @@
 {
   "replace": false,
-  "values": [
-    "tconstruct:sledge_hammer",
-    "tconstruct:vein_hammer",
-    "tconstruct:excavator",
-    "tconstruct:broad_axe",
-    "tconstruct:scythe",
-    "tconstruct:cleaver"
-  ]
+  "values": []
 }
diff --git a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java
@@ -195,24 +195,25 @@ private void addWorld() {
 
 
   private void addTools() {
+    this.tag(TWO_HANDED);
     // stone
     addToolTags(TinkerTools.pickaxe,      MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, STONE_HARVEST, MELEE,         ONE_HANDED, AOE, CLUSTER_MAX_HARVESTABLES);
-    addToolTags(TinkerTools.sledgeHammer, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, STONE_HARVEST, MELEE_PRIMARY, TWO_HANDED, AOE, CLUSTER_MAX_HARVESTABLES);
-    addToolTags(TinkerTools.veinHammer,   MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, STONE_HARVEST, MELEE,         TWO_HANDED, AOE, CLUSTER_MAX_HARVESTABLES);
+    addToolTags(TinkerTools.sledgeHammer, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, STONE_HARVEST, MELEE_PRIMARY, ONE_HANDED, AOE, CLUSTER_MAX_HARVESTABLES);
+    addToolTags(TinkerTools.veinHammer,   MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, STONE_HARVEST, MELEE,         ONE_HANDED, AOE, CLUSTER_MAX_HARVESTABLES);
     // dirtD
     addToolTags(TinkerTools.mattock,   MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE, ONE_HANDED, AOE);
     addToolTags(TinkerTools.pickadze,  MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE, ONE_HANDED, AOE, STONE_HARVEST);
-    addToolTags(TinkerTools.excavator, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE, TWO_HANDED, AOE);
+    addToolTags(TinkerTools.excavator, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE, ONE_HANDED, AOE);
     // wood
     addToolTags(TinkerTools.handAxe,  MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE_PRIMARY, ONE_HANDED, AOE);
-    addToolTags(TinkerTools.broadAxe, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE_PRIMARY, TWO_HANDED, AOE);
+    addToolTags(TinkerTools.broadAxe, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE_PRIMARY, ONE_HANDED, AOE);
     // plants
     addToolTags(TinkerTools.kama,   MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE,         ONE_HANDED, AOE);
-    addToolTags(TinkerTools.scythe, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE_PRIMARY, TWO_HANDED, AOE);
+    addToolTags(TinkerTools.scythe, MULTIPART_TOOL, DURABILITY, HARVEST_PRIMARY, MELEE_PRIMARY, ONE_HANDED, AOE);
     // sword
     addToolTags(TinkerTools.dagger,  MULTIPART_TOOL, DURABILITY, HARVEST, MELEE_PRIMARY, ONE_HANDED);
     addToolTags(TinkerTools.sword,   MULTIPART_TOOL, DURABILITY, HARVEST, MELEE_PRIMARY, ONE_HANDED, SWORD, AOE);
-    addToolTags(TinkerTools.cleaver, MULTIPART_TOOL, DURABILITY, HARVEST, MELEE_PRIMARY, TWO_HANDED, SWORD, AOE);
+    addToolTags(TinkerTools.cleaver, MULTIPART_TOOL, DURABILITY, HARVEST, MELEE_PRIMARY, ONE_HANDED, SWORD, AOE);
     // specialized
     addToolTags(TinkerTools.flintAndBrick, DURABILITY, MELEE, ONE_HANDED, AOE);
 

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -288,7 +288,6 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .addInput(SlimeType.ICHOR.getSlimeballTag())
                          .setMaxLevel(1)
                          .setSalvageLevelRange(1, 1)
-                         .setSlots(SlotType.UPGRADE, 1)
                          .saveSalvage(consumer, wrap(TinkerModifiers.offhanded, upgradeSalvage, "_level_1"))
                          .save(consumer, wrap(TinkerModifiers.offhanded, upgradeFolder, "_level_1"));
     ModifierRecipeBuilder.modifier(TinkerModifiers.offhanded)