Let modifier recipes decide whether to check the total level or just …

…the recipe level Modifiers such as pathing, bouncy, etc. don't want to be added to a tool that starts with it as a trait. While implementing this feature, discovered that most modifiers were accidently checking the total level instead of the recipe level (causing wrong behavior for things that are also traits like smite). The default for the new behavior has been set to recipe modifiers only to restore the 1.18 behavior
SlimeKnights · May 17, 2024 · a6fb00a · a6fb00a
1 parent 0a33800
commit a6fb00a
Show file tree

Hide file tree

Showing 41 changed files with 149 additions and 195 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/ambidextrous.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/ambidextrous.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "minecraft:leather"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/aqua_affinity.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/aqua_affinity.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "minecraft:prismarine_bricks"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/autosmelt.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/autosmelt.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:raw_materials"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/blocking.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/blocking.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "minecraft:planks"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/bonking.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/bonking.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:ingots/iron"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/bouncy.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/bouncy.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "amount_needed": 4,
@@ -29,12 +30,6 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "tag": "tconstruct:modifiable/armor/boots"
-    },
-    "subtracted": {
-      "item": "tconstruct:slime_boots"
-    }
+    "tag": "tconstruct:modifiable/armor/boots"
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/dual_wielding.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/dual_wielding.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:ingots/manyullyn"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/exchanging.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/exchanging.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "minecraft:sticky_piston"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/firestarter.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/firestarter.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:ingots/cobalt"
@@ -15,20 +16,14 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "type": "forge:intersection",
-      "children": [
-        {
-          "tag": "tconstruct:modifiable/durability"
-        },
-        {
-          "tag": "tconstruct:modifiable/interactable"
-        }
-      ]
-    },
-    "subtracted": {
-      "item": "tconstruct:flint_and_brick"
-    }
+    "type": "forge:intersection",
+    "children": [
+      {
+        "tag": "tconstruct:modifiable/durability"
+      },
+      {
+        "tag": "tconstruct:modifiable/interactable"
+      }
+    ]
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/flinging.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/flinging.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:string"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/glowing.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/glowing.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "minecraft:glowstone"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/long_fall.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/long_fall.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "minecraft:piston"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/parrying.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/parrying.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "minecraft:planks"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/pathing.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/pathing.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "type": "tconstruct:material",
@@ -20,24 +21,13 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "type": "forge:intersection",
-      "children": [
-        {
-          "tag": "tconstruct:modifiable/durability"
-        },
-        {
-          "tag": "tconstruct:modifiable/interactable"
-        }
-      ]
-    },
-    "subtracted": [
+    "type": "forge:intersection",
+    "children": [
       {
-        "item": "tconstruct:pickadze"
+        "tag": "tconstruct:modifiable/durability"
       },
       {
-        "item": "tconstruct:excavator"
+        "tag": "tconstruct:modifiable/interactable"
       }
     ]
   }

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/silky.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/silky.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "tconstruct:silky_cloth"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/springing.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/springing.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:feathers"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/stripping.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/stripping.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "type": "tconstruct:material",
@@ -20,24 +21,13 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "type": "forge:intersection",
-      "children": [
-        {
-          "tag": "tconstruct:modifiable/durability"
-        },
-        {
-          "tag": "tconstruct:modifiable/interactable"
-        }
-      ]
-    },
-    "subtracted": [
+    "type": "forge:intersection",
+    "children": [
       {
-        "item": "tconstruct:hand_axe"
+        "tag": "tconstruct:modifiable/durability"
       },
       {
-        "item": "tconstruct:broad_axe"
+        "tag": "tconstruct:modifiable/interactable"
       }
     ]
   }

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tilling.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/tilling.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "type": "tconstruct:material",
@@ -20,27 +21,13 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "type": "forge:intersection",
-      "children": [
-        {
-          "tag": "tconstruct:modifiable/durability"
-        },
-        {
-          "tag": "tconstruct:modifiable/interactable"
-        }
-      ]
-    },
-    "subtracted": [
-      {
-        "item": "tconstruct:mattock"
-      },
+    "type": "forge:intersection",
+    "children": [
       {
-        "item": "tconstruct:kama"
+        "tag": "tconstruct:modifiable/durability"
       },
       {
-        "item": "tconstruct:scythe"
+        "tag": "tconstruct:modifiable/interactable"
       }
     ]
   }

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
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "item": "minecraft:shulker_shell"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/warping.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/warping.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:ender_pearls"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/compat/the_one_probe.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/compat/the_one_probe.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "conditions": [
     {
       "type": "forge:mod_loaded",

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/defense/golden.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/defense/golden.json
@@ -1,6 +1,7 @@
 {
   "type": "tconstruct:modifier",
   "allow_crystal": true,
+  "check_trait_level": true,
   "inputs": [
     {
       "tag": "forge:ingots/gold"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/bouncy.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/bouncy.json
@@ -5,12 +5,6 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "tag": "tconstruct:modifiable/armor/boots"
-    },
-    "subtracted": {
-      "item": "tconstruct:slime_boots"
-    }
+    "tag": "tconstruct:modifiable/armor/boots"
   }
 }
diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/firestarter.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/firestarter.json
@@ -5,20 +5,14 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "type": "forge:intersection",
-      "children": [
-        {
-          "tag": "tconstruct:modifiable/durability"
-        },
-        {
-          "tag": "tconstruct:modifiable/interactable"
-        }
-      ]
-    },
-    "subtracted": {
-      "item": "tconstruct:flint_and_brick"
-    }
+    "type": "forge:intersection",
+    "children": [
+      {
+        "tag": "tconstruct:modifiable/durability"
+      },
+      {
+        "tag": "tconstruct:modifiable/interactable"
+      }
+    ]
   }
 }
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/pathing.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/pathing.json
@@ -5,24 +5,13 @@
     "abilities": 1
   },
   "tools": {
-    "type": "forge:difference",
-    "base": {
-      "type": "forge:intersection",
-      "children": [
-        {
-          "tag": "tconstruct:modifiable/durability"
-        },
-        {
-          "tag": "tconstruct:modifiable/interactable"
-        }
-      ]
-    },
-    "subtracted": [
+    "type": "forge:intersection",
+    "children": [
       {
-        "item": "tconstruct:pickadze"
+        "tag": "tconstruct:modifiable/durability"
       },
       {
-        "item": "tconstruct:excavator"
+        "tag": "tconstruct:modifiable/interactable"
       }
     ]
   }