Rework tool tiers a bit

Copper is now tier 1, as its really common in vanilla Wither bone is now tier 2 due to the difficult in obtaining it Seared stone is now a harvest material, and bloodbone is the overworld weapon material for tier 2
SlimeKnights · Feb 28, 2022 · 28c302d · 28c302d
1 parent 5a6e20d
commit 28c302d
Show file tree

Hide file tree

Showing 24 changed files with 191 additions and 130 deletions.
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/bloodbone.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/bloodbone.json
@@ -1,6 +1,6 @@
 {
   "craftable": false,
   "tier": 2,
-  "sortOrder": 3,
+  "sortOrder": 2,
   "hidden": false
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/copper.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/copper.json
@@ -1,6 +1,6 @@
 {
   "craftable": true,
-  "tier": 2,
-  "sortOrder": 1,
+  "tier": 1,
+  "sortOrder": 3,
   "hidden": false
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/necrotic_bone.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/necrotic_bone.json
@@ -1,6 +1,6 @@
 {
   "craftable": true,
-  "tier": 1,
-  "sortOrder": 3,
+  "tier": 2,
+  "sortOrder": 10,
   "hidden": false
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/seared_stone.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/seared_stone.json
@@ -1,6 +1,6 @@
 {
   "craftable": false,
   "tier": 2,
-  "sortOrder": 2,
+  "sortOrder": 1,
   "hidden": false
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/blazing_bone.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/blazing_bone.json
@@ -7,9 +7,9 @@
     "tconstruct:extra": {},
     "tconstruct:handle": {
       "durability": 0.85,
-      "miningSpeed": 1.05,
+      "miningSpeed": 1.0,
       "attackSpeed": 1.2,
-      "attackDamage": 1.0
+      "attackDamage": 1.05
     },
     "tconstruct:head": {
       "durability": 530,

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/cobalt.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/cobalt.json
@@ -9,7 +9,7 @@
     },
     "tconstruct:head": {
       "durability": 800,
-      "miningSpeed": 7.5,
+      "miningSpeed": 6.5,
       "harvestTier": "minecraft:diamond",
       "attack": 2.25
     }

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/copper.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/copper.json
@@ -6,16 +6,16 @@
     },
     "tconstruct:extra": {},
     "tconstruct:handle": {
-      "durability": 0.85,
-      "miningSpeed": 1.2,
+      "durability": 0.8,
+      "miningSpeed": 1.1,
       "attackSpeed": 1.0,
-      "attackDamage": 1.0
+      "attackDamage": 1.05
     },
     "tconstruct:head": {
       "durability": 210,
-      "miningSpeed": 6.5,
+      "miningSpeed": 5.0,
       "harvestTier": "minecraft:iron",
-      "attack": 1.5
+      "attack": 0.5
     }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/electrum.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/electrum.json
@@ -9,7 +9,7 @@
     },
     "tconstruct:head": {
       "durability": 225,
-      "miningSpeed": 9.0,
+      "miningSpeed": 8.5,
       "harvestTier": "minecraft:iron",
       "attack": 1.5
     }

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/flint.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/flint.json
@@ -2,7 +2,7 @@
   "stats": {
     "tconstruct:extra": {},
     "tconstruct:handle": {
-      "durability": 0.8,
+      "durability": 0.85,
       "miningSpeed": 1.0,
       "attackSpeed": 1.0,
       "attackDamage": 1.1

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/lead.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/lead.json
@@ -2,9 +2,9 @@
   "stats": {
     "tconstruct:extra": {},
     "tconstruct:handle": {
-      "durability": 1.0,
+      "durability": 0.9,
       "miningSpeed": 1.0,
-      "attackSpeed": 0.8,
+      "attackSpeed": 0.9,
       "attackDamage": 1.2
     },
     "tconstruct:head": {

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/necrotic_bone.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/necrotic_bone.json
@@ -6,16 +6,16 @@
     },
     "tconstruct:extra": {},
     "tconstruct:handle": {
-      "durability": 0.65,
+      "durability": 0.7,
       "miningSpeed": 1.0,
       "attackSpeed": 1.15,
-      "attackDamage": 1.0
+      "attackDamage": 1.05
     },
     "tconstruct:head": {
       "durability": 125,
-      "miningSpeed": 2.0,
-      "harvestTier": "minecraft:stone",
-      "attack": 1.5
+      "miningSpeed": 4.0,
+      "harvestTier": "minecraft:iron",
+      "attack": 2.25
     }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/rock.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/rock.json
@@ -2,8 +2,8 @@
   "stats": {
     "tconstruct:extra": {},
     "tconstruct:handle": {
-      "durability": 0.8,
-      "miningSpeed": 1.1,
+      "durability": 0.9,
+      "miningSpeed": 1.05,
       "attackSpeed": 1.0,
       "attackDamage": 1.0
     },

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/rose_gold.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/rose_gold.json
@@ -7,13 +7,13 @@
     "tconstruct:extra": {},
     "tconstruct:handle": {
       "durability": 0.6,
-      "miningSpeed": 1.25,
-      "attackSpeed": 1.25,
+      "miningSpeed": 1.2,
+      "attackSpeed": 1.2,
       "attackDamage": 1.0
     },
     "tconstruct:head": {
       "durability": 175,
-      "miningSpeed": 10.0,
+      "miningSpeed": 9.0,
       "harvestTier": "minecraft:gold",
       "attack": 1.0
     }

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/seared_stone.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/seared_stone.json
@@ -3,15 +3,15 @@
     "tconstruct:extra": {},
     "tconstruct:handle": {
       "durability": 0.85,
-      "miningSpeed": 1.0,
+      "miningSpeed": 1.1,
       "attackSpeed": 1.0,
-      "attackDamage": 1.15
+      "attackDamage": 1.05
     },
     "tconstruct:head": {
       "durability": 225,
-      "miningSpeed": 5.0,
+      "miningSpeed": 6.5,
       "harvestTier": "minecraft:iron",
-      "attack": 2.25
+      "attack": 1.5
     }
   }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/stats/whitestone.json b/src/generated/resources/data/tconstruct/tinkering/materials/stats/whitestone.json
@@ -2,9 +2,9 @@
   "stats": {
     "tconstruct:extra": {},
     "tconstruct:handle": {
-      "durability": 1.05,
+      "durability": 0.95,
       "miningSpeed": 1.1,
-      "attackSpeed": 0.9,
+      "attackSpeed": 0.95,
       "attackDamage": 1.0
     },
     "tconstruct:head": {

diff --git a/src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java b/src/main/java/slimeknights/tconstruct/tools/TinkerModifiers.java
@@ -140,6 +140,7 @@
 import slimeknights.tconstruct.tools.modifiers.traits.harvest.MaintainedModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.harvest.MaintainedModifier2;
 import slimeknights.tconstruct.tools.modifiers.traits.harvest.MomentumModifier;
+import slimeknights.tconstruct.tools.modifiers.traits.harvest.SearingModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.harvest.SharpweightModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.harvest.TemperateModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.melee.ConductingModifier;
@@ -152,7 +153,6 @@
 import slimeknights.tconstruct.tools.modifiers.traits.melee.NecroticModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.melee.RagingModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.melee.ScorchingModifier;
-import slimeknights.tconstruct.tools.modifiers.traits.melee.SearingModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.skull.BoonOfSssssModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.skull.BreathtakingModifier;
 import slimeknights.tconstruct.tools.modifiers.traits.skull.ChrysophiliteModifier;

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/material/MaterialDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/material/MaterialDataProvider.java
@@ -21,25 +21,24 @@ public String getName() {
   @Override
   protected void addMaterials() {
     // tier 1
-    addMaterial(MaterialIds.wood,  1, ORDER_GENERAL, true);
-    addMaterial(MaterialIds.rock,  1, ORDER_HARVEST, true);
-    addMaterial(MaterialIds.flint, 1, ORDER_WEAPON,  true);
-    addMaterial(MaterialIds.bone,  1, ORDER_SPECIAL, true);
-    // tier 1 - nether
-    addMaterial(MaterialIds.necroticBone,  1, ORDER_SPECIAL, true);
+    addMaterial(MaterialIds.wood,   1, ORDER_GENERAL, true);
+    addMaterial(MaterialIds.rock,   1, ORDER_HARVEST, true);
+    addMaterial(MaterialIds.flint,  1, ORDER_WEAPON,  true);
+    addMaterial(MaterialIds.copper, 1, ORDER_SPECIAL, true);
+    addMaterial(MaterialIds.bone,   1, ORDER_SPECIAL, true);
     // tier 1 - binding
     addMaterial(MaterialIds.string,  1, ORDER_BINDING, true);
     addMaterial(MaterialIds.leather, 1, ORDER_BINDING, true);
     addMaterial(MaterialIds.vine,    1, ORDER_BINDING, true);
 
     // tier 2
     addMaterial(MaterialIds.iron,        2, ORDER_GENERAL, false);
-    addMaterial(MaterialIds.copper,      2, ORDER_HARVEST, true);
-    addMaterial(MaterialIds.searedStone, 2, ORDER_WEAPON,  false);
+    addMaterial(MaterialIds.searedStone, 2, ORDER_HARVEST, false);
+    addMaterial(MaterialIds.bloodbone,   2, ORDER_WEAPON,  false);
     addMaterial(MaterialIds.slimewood,   2, ORDER_SPECIAL, true);
-    addMaterial(MaterialIds.bloodbone,   2, ORDER_SPECIAL, false);
     // tier 2 - nether
     addMaterial(MaterialIds.scorchedStone, 2, ORDER_NETHER, false);
+    addMaterial(MaterialIds.necroticBone,  2, ORDER_NETHER, true);
     // tier 2 - binding
     addMaterial(MaterialIds.chain,        2, ORDER_BINDING, true);
     addMaterial(MaterialIds.skyslimeVine, 2, ORDER_BINDING, true);

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/material/MaterialStatsDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/material/MaterialStatsDataProvider.java
@@ -39,21 +39,20 @@ protected void addMaterialStats() {
     // vanilla stone: 131, 4f, STONE, 1f
     addMaterialStats(MaterialIds.rock,
                      new HeadMaterialStats(130, 4f, STONE, 1f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.8f).withMiningSpeed(1.1f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.9f).withMiningSpeed(1.05f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.flint,
                      new HeadMaterialStats(85, 3.5f, STONE, 1.25f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.8f).withAttackDamage(1.1f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.85f).withAttackDamage(1.1f),
+                     ExtraMaterialStats.DEFAULT);
+    addMaterialStats(MaterialIds.copper,
+                     new HeadMaterialStats(210, 5.0f, IRON, 0.5f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.80f).withMiningSpeed(1.1f).withAttackDamage(1.05f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.bone,
                      new HeadMaterialStats(100, 2.5f, STONE, 1.25f),
                      HandleMaterialStats.DEFAULT.withDurability(0.75f).withAttackSpeed(1.1f),
                      ExtraMaterialStats.DEFAULT);
-    // tier 1 - nether
-    addMaterialStats(MaterialIds.necroticBone,
-                     new HeadMaterialStats(125, 2f, STONE, 1.5f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.65f).withAttackSpeed(1.15f),
-                     ExtraMaterialStats.DEFAULT);
     // tier 1 - binding
     addMaterialStats(MaterialIds.string, ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.leather, ExtraMaterialStats.DEFAULT);
@@ -65,25 +64,26 @@ protected void addMaterialStats() {
                      new HeadMaterialStats(250, 6f, IRON, 2f),
                      HandleMaterialStats.DEFAULT.withDurability(1.10f),
                      ExtraMaterialStats.DEFAULT);
-    addMaterialStats(MaterialIds.copper,
-                     new HeadMaterialStats(210, 6.5f, IRON, 1.5f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.85f).withMiningSpeed(1.2f),
-                     ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.searedStone,
-                     new HeadMaterialStats(225, 5f, IRON, 2.25f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.85f).withAttackDamage(1.15f),
+                     new HeadMaterialStats(225, 6.5f, IRON, 1.5f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.85f).withMiningSpeed(1.10f).withAttackDamage(1.05f),
                      ExtraMaterialStats.DEFAULT);
-    addMaterialStats(MaterialIds.scorchedStone,
-                     new HeadMaterialStats(120, 4.5f, IRON, 2.5f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.8f).withAttackSpeed(1.05f).withAttackDamage(1.1f),
+    addMaterialStats(MaterialIds.bloodbone,
+                     new HeadMaterialStats(175, 4.5f, IRON, 2.25f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.9f).withAttackSpeed(1.1f).withAttackDamage(1.05f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.slimewood,
                      new HeadMaterialStats(375, 4f, IRON, 1f),
                      HandleMaterialStats.DEFAULT.withDurability(1.3f).withMiningSpeed(0.85f).withAttackDamage(0.85f),
                      ExtraMaterialStats.DEFAULT);
-    addMaterialStats(MaterialIds.bloodbone,
-                     new HeadMaterialStats(175, 4.5f, IRON, 2.25f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.9f).withAttackSpeed(1.1f).withAttackDamage(1.05f),
+    // tier 2 - nether
+    addMaterialStats(MaterialIds.scorchedStone,
+                     new HeadMaterialStats(120, 4.5f, IRON, 2.5f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.8f).withAttackSpeed(1.05f).withAttackDamage(1.1f),
+                     ExtraMaterialStats.DEFAULT);
+    addMaterialStats(MaterialIds.necroticBone,
+                     new HeadMaterialStats(125, 4f, IRON, 2.25f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.7f).withAttackSpeed(1.15f).withAttackDamage(1.05f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.chain, ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.skyslimeVine, ExtraMaterialStats.DEFAULT);
@@ -107,11 +107,11 @@ protected void addMaterialStats() {
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.lead,
                      new HeadMaterialStats(200, 5f, IRON, 2.5f),
-                     HandleMaterialStats.DEFAULT.withAttackSpeed(0.8f).withAttackDamage(1.2f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.9f).withAttackSpeed(0.9f).withAttackDamage(1.2f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.whitestone,
                      new HeadMaterialStats(275, 6.0f, IRON, 1.25f),
-                     HandleMaterialStats.DEFAULT.withDurability(1.05f).withMiningSpeed(1.1f).withAttackSpeed(0.9f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.95f).withMiningSpeed(1.1f).withAttackSpeed(0.95f),
                      ExtraMaterialStats.DEFAULT);
 
     // tier 3
@@ -134,12 +134,12 @@ protected void addMaterialStats() {
                      ExtraMaterialStats.DEFAULT);
     // vanilla gold: 32, 12f, WOOD, 0f
     addMaterialStats(MaterialIds.roseGold,
-                     new HeadMaterialStats(175, 10f, GOLD, 1f), // gold mining level technically puts it in tier 0, but lets see if some mod does something weird
-                     HandleMaterialStats.DEFAULT.withDurability(0.6f).withMiningSpeed(1.25f).withAttackSpeed(1.25f),
+                     new HeadMaterialStats(175, 9f, GOLD, 1f), // gold mining level technically puts it in tier 0, but lets see if some mod does something weird
+                     HandleMaterialStats.DEFAULT.withDurability(0.6f).withMiningSpeed(1.20f).withAttackSpeed(1.20f),
                      ExtraMaterialStats.DEFAULT);
     // tier 3 (nether)
     addMaterialStats(MaterialIds.cobalt,
-                     new HeadMaterialStats(800, 7.5f, DIAMOND, 2.25f),
+                     new HeadMaterialStats(800, 6.5f, DIAMOND, 2.25f),
                      HandleMaterialStats.DEFAULT.withDurability(1.05f).withMiningSpeed(1.05f).withAttackSpeed(1.05f),
                      ExtraMaterialStats.DEFAULT);
 
@@ -165,7 +165,7 @@ protected void addMaterialStats() {
                      HandleMaterialStats.DEFAULT.withDurability(0.8f).withAttackSpeed(1.15f).withAttackDamage(1.1f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.electrum,
-                     new HeadMaterialStats(225, 9f, IRON, 1.5f),
+                     new HeadMaterialStats(225, 8.5f, IRON, 1.5f),
                      HandleMaterialStats.DEFAULT.withDurability(0.8f).withAttackSpeed(1.15f).withMiningSpeed(1.15f),
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.platedSlimewood,
@@ -189,7 +189,7 @@ protected void addMaterialStats() {
                      ExtraMaterialStats.DEFAULT);
     addMaterialStats(MaterialIds.blazingBone,
                      new HeadMaterialStats(530, 6f, IRON, 3f),
-                     HandleMaterialStats.DEFAULT.withDurability(0.85f).withMiningSpeed(1.05f).withAttackSpeed(1.2f),
+                     HandleMaterialStats.DEFAULT.withDurability(0.85f).withAttackDamage(1.05f).withAttackSpeed(1.2f),
                      ExtraMaterialStats.DEFAULT);
     //    addMaterialStats(MaterialIds.soulsteel,
     //                     new HeadMaterialStats(1120, 7.5f, NETHERITE, 3f),