Add support for attributes in the stat boost modifier

Also fixes the salvage recipe for revitalized
SlimeKnights · Apr 13, 2022 · 7317b11 · 7317b11
1 parent 8dd034a
commit 7317b11
Show file tree

Hide file tree

Showing 25 changed files with 429 additions and 365 deletions.
diff --git a/...rated/resources/data/tconstruct/recipes/tools/modifiers/salvage/defense/revitalizing.json b/...rated/resources/data/tconstruct/recipes/tools/modifiers/salvage/defense/revitalizing.json
@@ -9,7 +9,7 @@
   "modifier": "tconstruct:revitalizing",
   "min_level": 1,
   "salvage": {
-    "item": "minecraft:ghast_tear",
-    "full": false
+    "item": "tconstruct:jeweled_apple",
+    "count": 2
   }
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/heavy.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/heavy.json
@@ -0,0 +1,22 @@
+{
+  "type": "tconstruct:stat_boost",
+  "stats": [
+    {
+      "stat": "tconstruct:attack_damage",
+      "type": "multiply_base",
+      "value": 0.1
+    }
+  ],
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.heavy",
+      "attribute": "minecraft:generic.movement_speed",
+      "operation": "multiply_base",
+      "amount": -0.1,
+      "slots": [
+        "mainhand",
+        "offhand"
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/knockback_armor.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/knockback_armor.json
@@ -0,0 +1,17 @@
+{
+  "type": "tconstruct:stat_boost",
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.armor_knockback",
+      "attribute": "minecraft:generic.attack_knockback",
+      "operation": "addition",
+      "amount": 1.0,
+      "slots": [
+        "feet",
+        "legs",
+        "chest",
+        "head"
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/reach.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/reach.json
@@ -0,0 +1,18 @@
+{
+  "type": "tconstruct:stat_boost",
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.reach",
+      "attribute": "forge:reach_distance",
+      "operation": "addition",
+      "amount": 1.0,
+      "slots": [
+        "mainhand",
+        "feet",
+        "legs",
+        "chest",
+        "head"
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/revitalizing.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/revitalizing.json
@@ -0,0 +1,17 @@
+{
+  "type": "tconstruct:stat_boost",
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.revitalizing",
+      "attribute": "minecraft:generic.max_health",
+      "operation": "addition",
+      "amount": 2.0,
+      "slots": [
+        "feet",
+        "legs",
+        "chest",
+        "head"
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/sharpweight.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/sharpweight.json
@@ -0,0 +1,22 @@
+{
+  "type": "tconstruct:stat_boost",
+  "stats": [
+    {
+      "stat": "tconstruct:mining_speed",
+      "type": "multiply_base",
+      "value": 0.1
+    }
+  ],
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.sharpweight",
+      "attribute": "minecraft:generic.movement_speed",
+      "operation": "multiply_base",
+      "amount": -0.1,
+      "slots": [
+        "mainhand",
+        "offhand"
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/speedy.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/speedy.json
@@ -0,0 +1,17 @@
+{
+  "type": "tconstruct:stat_boost",
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.speedy",
+      "attribute": "minecraft:generic.movement_speed",
+      "operation": "multiply_total",
+      "amount": 0.1,
+      "slots": [
+        "feet",
+        "legs",
+        "chest",
+        "head"
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/modifiers/strength.json b/src/generated/resources/data/tconstruct/tinkering/modifiers/strength.json
@@ -0,0 +1,17 @@
+{
+  "type": "tconstruct:stat_boost",
+  "attributes": [
+    {
+      "unique": "tconstruct.modifier.strength",
+      "attribute": "minecraft:generic.attack_damage",
+      "operation": "multiply_total",
+      "amount": 0.1,
+      "slots": [
+        "feet",
+        "legs",
+        "chest",
+        "head"
+      ]
+    }
+  ]
+}
diff --git a/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java b/src/main/java/slimeknights/tconstruct/common/data/AdvancementsProvider.java
@@ -232,7 +232,7 @@ protected void generate() {
       // general
       with.accept(ModifierIds.gilded);
       withL.accept(TinkerModifiers.luck);
-      withL.accept(TinkerModifiers.reach);
+      with.accept(ModifierIds.reach);
       withL.accept(TinkerModifiers.unbreakable);
       // armor
       withL.accept(TinkerModifiers.aquaAffinity);
@@ -247,7 +247,7 @@ protected void generate() {
       withL.accept(TinkerModifiers.shieldStrap);
       withL.accept(TinkerModifiers.slurping);
       withL.accept(TinkerModifiers.snowdrift);
-      withL.accept(TinkerModifiers.strength);
+      with.accept(ModifierIds.strength);
       withL.accept(TinkerModifiers.toolBelt);
       withL.accept(TinkerModifiers.unarmed);
       withL.accept(TinkerModifiers.zoom);