Fixed some errors warnings. But both these classes are non-functional for now.

.envrc

@@ -0,0 +1 @@
+use nix

.gitignore

@@ -17,4 +17,4 @@ classes/
 .settings
 *.launch
 .architectury-transformer
-/common/src/generated/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
+/common/src/generated/.cache

.tool-versions

@@ -1,2 +1 @@
 java openjdk-17
-gradle 8.8

.vscode/launch.json

@@ -3,29 +3,19 @@
   "configurations": [
     {
       "type": "java",
-      "name": "Minecraft Client (:fabric)",
+      "request": "attach",
-      "request": "launch",
+      "name": "Attach to Forge Client",
-      "cwd": "${workspaceFolder}/fabric/run",
+      "hostName": "localhost",
-      "console": "integratedTerminal",
+      "port": 5005,
-      "stopOnEntry": false,
+      "preLaunchTask": "Forge: runClient (fish) with Debug"
-      "mainClass": "dev.architectury.transformer.TransformerRuntime",
-      "vmArgs": "-Dfabric.dli.config\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/loom-cache/launch.cfg -Dfabric.dli.env\u003dclient -Dfabric.dli.main\u003dnet.fabricmc.loader.impl.launch.knot.KnotClient -Darchitectury.main.class\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.main_class -Darchitectury.runtime.transformer\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.transforms -Darchitectury.properties\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.properties -Djdk.attach.allowAttachSelf\u003dtrue -javaagent:/home/toph/git/simplycompat-1.20.1-fabric-forge-template/.gradle/architectury/architectury-transformer-agent.jar",
-      "args": "",
-      "env": {},
-      "projectName": "fabric"
     },
     {
       "type": "java",
-      "name": "Minecraft Server (:fabric)",
+      "request": "attach",
-      "request": "launch",
+      "name": "Attach to Fabric Client",
-      "cwd": "${workspaceFolder}/fabric/run",
+      "hostName": "localhost",
-      "console": "integratedTerminal",
+      "port": 5005,
-      "stopOnEntry": false,
+      "preLaunchTask": "Fabric: runClient (fish) with Debug"
-      "mainClass": "dev.architectury.transformer.TransformerRuntime",
-      "vmArgs": "-Dfabric.dli.config\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/loom-cache/launch.cfg -Dfabric.dli.env\u003dserver -Dfabric.dli.main\u003dnet.fabricmc.loader.impl.launch.knot.KnotServer -Darchitectury.main.class\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.main_class -Darchitectury.runtime.transformer\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.transforms -Darchitectury.properties\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.properties -Djdk.attach.allowAttachSelf\u003dtrue -javaagent:/home/toph/git/simplycompat-1.20.1-fabric-forge-template/.gradle/architectury/architectury-transformer-agent.jar",
-      "args": "nogui",
-      "env": {},
-      "projectName": "fabric"
     }
   ]
 }

.vscode/settings.json

@@ -15,10 +15,8 @@
   },
   "java.compile.nullAnalysis.mode": "automatic",
   "java.configuration.updateBuildConfiguration": "interactive",
-  "java.import.gradle.home": "/home/toph/.asdf/installs/gradle/8.8",
-  "java.jdt.ls.java.home": "/home/toph/.asdf/installs/java/openjdk-17",
   "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
-  "jdk.jdkhome": "/home/toph/.asdf/installs/java/openjdk-17",
   "prettier-plugin-java-vscode.prettierConfigPath": "${workspaceFolder}/.prettierrc.yaml",
-  "workbench.iconTheme": "material-icon-theme"
+  "workbench.iconTheme": "material-icon-theme",
+  "jdk.jdkhome": "/home/toph/.asdf/installs/java/openjdk-17"
 }

.vscode/tasks.json

@@ -0,0 +1,29 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Forge: runClient with Debug",
+      "type": "shell",
+      "command": "nix-shell",
+      "args": [
+        "--command",
+        "gradle forge:runClient --offline --no-daemon --stacktrace --debug-jvm"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}"
+      }
+    },
+    {
+      "label": "Fabric: runClient with Debug",
+      "type": "shell",
+      "command": "nix-shell",
+      "args": [
+        "--command",
+        "gradle fabric:runClient --offline --no-daemon --stacktrace --debug-jvm"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}"
+      }
+    }
+  ]
+}

common/src/generated/data/progression/advancements/recipes/combat/copper_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_spear"
+        "recipe": "progression:copper_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_spear"
+      "progression:copper_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/copper_chestplate.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_claymore"
+        "recipe": "progression:copper_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_claymore"
+      "progression:copper_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/copper_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_katana"
+        "recipe": "progression:copper_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_katana"
+      "progression:copper_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/copper_leggings.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_chakram"
+        "recipe": "progression:copper_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_chakram"
+      "progression:copper_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/copper_sword.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_rapier"
+        "recipe": "progression:copper_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_rapier"
+      "progression:copper_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/echo_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create_deep_dark:echo_ingot"
+              "progression:echo_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:echo_sai"
+        "recipe": "progression:echo_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:echo_sai"
+      "progression:echo_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/echo_chestplate.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create_deep_dark:echo_ingot"
+              "progression:echo_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:echo_glaive"
+        "recipe": "progression:echo_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:echo_glaive"
+      "progression:echo_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/echo_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create_deep_dark:echo_ingot"
+              "progression:echo_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:echo_spear"
+        "recipe": "progression:echo_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:echo_spear"
+      "progression:echo_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/echo_leggings.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create_deep_dark:echo_ingot"
+              "progression:echo_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:echo_katana"
+        "recipe": "progression:echo_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:echo_katana"
+      "progression:echo_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/echo_sword.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create_deep_dark:echo_ingot"
+              "progression:echo_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:echo_rapier"
+        "recipe": "progression:echo_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:echo_rapier"
+      "progression:echo_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:exposed_copper_ingot"
+              "progression:exposed_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:exposed_copper_sai"
+        "recipe": "progression:exposed_copper_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:exposed_copper_sai"
+      "progression:exposed_copper_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_chestplate.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:exposed_copper_ingot"
+              "progression:exposed_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:exposed_copper_chakram"
+        "recipe": "progression:exposed_copper_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:exposed_copper_chakram"
+      "progression:exposed_copper_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:exposed_copper_ingot"
+              "progression:exposed_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:exposed_copper_spear"
+        "recipe": "progression:exposed_copper_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:exposed_copper_spear"
+      "progression:exposed_copper_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_leggings.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:exposed_copper_ingot"
+              "progression:exposed_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:exposed_copper_rapier"
+        "recipe": "progression:exposed_copper_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:exposed_copper_rapier"
+      "progression:exposed_copper_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_sword.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:exposed_copper_ingot"
+              "progression:exposed_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:exposed_copper_glaive"
+        "recipe": "progression:exposed_copper_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:exposed_copper_glaive"
+      "progression:exposed_copper_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:oxidized_copper_ingot"
+              "progression:oxidized_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:oxidized_copper_sai"
+        "recipe": "progression:oxidized_copper_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:oxidized_copper_sai"
+      "progression:oxidized_copper_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_chestplate.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:oxidized_copper_ingot"
+              "progression:oxidized_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:oxidized_copper_chakram"
+        "recipe": "progression:oxidized_copper_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:oxidized_copper_chakram"
+      "progression:oxidized_copper_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:oxidized_copper_ingot"
+              "progression:oxidized_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:oxidized_copper_spear"
+        "recipe": "progression:oxidized_copper_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:oxidized_copper_spear"
+      "progression:oxidized_copper_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_leggings.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:oxidized_copper_ingot"
+              "progression:oxidized_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:oxidized_copper_rapier"
+        "recipe": "progression:oxidized_copper_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:oxidized_copper_rapier"
+      "progression:oxidized_copper_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_sword.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:oxidized_copper_ingot"
+              "progression:oxidized_copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:oxidized_copper_glaive"
+        "recipe": "progression:oxidized_copper_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:oxidized_copper_glaive"
+      "progression:oxidized_copper_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/refined_boots.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:aluminum_spear"
+        "recipe": "progression:refined_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_spear"
+      "progression:refined_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/refined_chestplate.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_refined": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:refined_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:refined_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_refined",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:refined_chestplate"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/refined_helmet.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:aluminum_katana"
+        "recipe": "progression:refined_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_katana"
+      "progression:refined_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/refined_leggings.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:aluminum_claymore"
+        "recipe": "progression:refined_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_claymore"
+      "progression:refined_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/refined_sword.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_refined": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:refined_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:refined_sword"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_refined",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:refined_sword"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/rose_gold_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "additionaladditions:rose_gold_alloy"
+              "progression:rose_gold_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:rose_gold_sai"
+        "recipe": "progression:rose_gold_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:rose_gold_sai"
+      "progression:rose_gold_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/rose_gold_chestplate.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "additionaladditions:rose_gold_alloy"
+              "progression:rose_gold_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:rose_gold_spear"
+        "recipe": "progression:rose_gold_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:rose_gold_spear"
+      "progression:rose_gold_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/rose_gold_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "additionaladditions:rose_gold_alloy"
+              "progression:rose_gold_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:rose_gold_rapier"
+        "recipe": "progression:rose_gold_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:rose_gold_rapier"
+      "progression:rose_gold_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/rose_gold_leggings.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "additionaladditions:rose_gold_alloy"
+              "progression:rose_gold_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:rose_gold_glaive"
+        "recipe": "progression:rose_gold_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:rose_gold_glaive"
+      "progression:rose_gold_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/rose_gold_sword.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_rose_gold": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:rose_gold_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:rose_gold_sword"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_rose_gold",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:rose_gold_sword"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/shock_sword.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_shock": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:shock_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:shock_sword"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_shock",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:shock_sword"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/steel_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_chakram"
+        "recipe": "progression:steel_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_chakram"
+      "progression:steel_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/steel_chestplate.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_steel": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:steel_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:steel_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_steel",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:steel_chestplate"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/steel_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_claymore"
+        "recipe": "progression:steel_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_claymore"
+      "progression:steel_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/steel_leggings.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_steel": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:steel_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:steel_leggings"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_steel",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:steel_leggings"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/steel_sword.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_halberd"
+        "recipe": "progression:steel_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_halberd"
+      "progression:steel_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/sturdy_boots.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_katana"
+        "recipe": "progression:sturdy_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_katana"
+      "progression:sturdy_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/sturdy_chestplate.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_glaive"
+        "recipe": "progression:sturdy_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_glaive"
+      "progression:sturdy_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/sturdy_helmet.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_chakram"
+        "recipe": "progression:sturdy_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_chakram"
+      "progression:sturdy_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/sturdy_leggings.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_cutlass"
+        "recipe": "progression:sturdy_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_cutlass"
+      "progression:sturdy_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/sturdy_sword.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_rapier"
+        "recipe": "progression:sturdy_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_rapier"
+      "progression:sturdy_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/void_boots.json

@@ -1,34 +1,34 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_lead": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_boots"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:lead_ingot"
+              "progression:void_ingot"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "simplycompat:lead_cutlass"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_lead",
+      "has_void",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:lead_cutlass"
+      "progression:void_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/void_chestplate.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:void_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_void",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:void_chestplate"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/void_helmet.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_helmet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:void_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_void",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:void_helmet"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/void_leggings.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_leggings"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:void_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_void",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:void_leggings"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/void_sword.json

@@ -1,34 +1,34 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_lead": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_sword"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:lead_ingot"
+              "progression:void_ingot"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "simplycompat:lead_glaive"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_lead",
+      "has_void",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:lead_glaive"
+      "progression:void_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_boots.json

@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:weathered_copper_sai"
+        "recipe": "progression:weathered_copper_boots"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:weathered_copper_ingot"
+              "progression:weathered_copper_ingot"
             ]
           }
         ]
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:weathered_copper_sai"
+      "progression:weathered_copper_boots"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_chestplate.json

@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:weathered_copper_chakram"
+        "recipe": "progression:weathered_copper_chestplate"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:weathered_copper_ingot"
+              "progression:weathered_copper_ingot"
             ]
           }
         ]
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:weathered_copper_chakram"
+      "progression:weathered_copper_chestplate"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_helmet.json

@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:weathered_copper_spear"
+        "recipe": "progression:weathered_copper_helmet"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:weathered_copper_ingot"
+              "progression:weathered_copper_ingot"
             ]
           }
         ]
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:weathered_copper_spear"
+      "progression:weathered_copper_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_leggings.json

@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:weathered_copper_rapier"
+        "recipe": "progression:weathered_copper_leggings"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:weathered_copper_ingot"
+              "progression:weathered_copper_ingot"
             ]
           }
         ]
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:weathered_copper_rapier"
+      "progression:weathered_copper_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_sword.json

@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:weathered_copper_glaive"
+        "recipe": "progression:weathered_copper_sword"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "purecoppertools:weathered_copper_ingot"
+              "progression:weathered_copper_ingot"
             ]
           }
         ]
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:weathered_copper_glaive"
+      "progression:weathered_copper_sword"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/whither_boots.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:whither_boots"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_whither": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:whither_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_whither",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:whither_boots"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/whither_chestplate.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:whither_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_whither": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:whither_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_whither",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:whither_chestplate"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/combat/whither_helmet.json

@@ -1,34 +1,34 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:whither_helmet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_whither": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:whither_ingot"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "simplycompat:aluminum_rapier"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_whither",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_rapier"
+      "progression:whither_helmet"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/whither_leggings.json

@@ -1,34 +1,34 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:whither_leggings"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_whither": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:whither_ingot"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "simplycompat:aluminum_cutlass"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_whither",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_cutlass"
+      "progression:whither_leggings"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/combat/whither_sword.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:whither_sword"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_whither": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:whither_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_whither",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:whither_sword"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/copper_axe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_sai"
+        "recipe": "progression:copper_axe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_sai"
+      "progression:copper_axe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/copper_hoe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_glaive"
+        "recipe": "progression:copper_hoe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_glaive"
+      "progression:copper_hoe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/copper_pickaxe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "minecraft:copper_ingot"
+              "progression:copper_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:copper_cutlass"
+        "recipe": "progression:copper_pickaxe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:copper_cutlass"
+      "progression:copper_pickaxe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/copper_shovel.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:copper_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:copper_shovel"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/echo_axe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_echo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:echo_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:echo_axe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_echo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:echo_axe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/echo_hoe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_echo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:echo_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:echo_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_echo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:echo_hoe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/echo_pickaxe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_echo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:echo_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:echo_pickaxe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_echo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:echo_pickaxe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/echo_shovel.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_echo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:echo_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:echo_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_echo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:echo_shovel"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_axe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_exposed_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:exposed_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:exposed_copper_axe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_exposed_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:exposed_copper_axe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_hoe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_exposed_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:exposed_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:exposed_copper_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_exposed_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:exposed_copper_hoe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_pickaxe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_exposed_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:exposed_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:exposed_copper_pickaxe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_exposed_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:exposed_copper_pickaxe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_shovel.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_exposed_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:exposed_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:exposed_copper_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_exposed_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:exposed_copper_shovel"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_axe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_oxidized_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:oxidized_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:oxidized_copper_axe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_oxidized_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:oxidized_copper_axe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_hoe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_oxidized_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:oxidized_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:oxidized_copper_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_oxidized_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:oxidized_copper_hoe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_pickaxe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_oxidized_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:oxidized_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:oxidized_copper_pickaxe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_oxidized_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:oxidized_copper_pickaxe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_shovel.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_oxidized_copper": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:oxidized_copper_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:oxidized_copper_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_oxidized_copper",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:oxidized_copper_shovel"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/refined_axe.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:aluminum_sai"
+        "recipe": "progression:refined_axe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_sai"
+      "progression:refined_axe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/refined_hoe.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_echo": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "create_deep_dark:echo_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:echo_chakram"
+        "recipe": "progression:refined_hoe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_echo",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:echo_chakram"
+      "progression:refined_hoe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/refined_pickaxe.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:aluminum_chakram"
+        "recipe": "progression:refined_pickaxe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_chakram"
+      "progression:refined_pickaxe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/refined_shovel.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_aluminum": {
+    "has_refined": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:aluminum_ingot"
+              "progression:refined_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:aluminum_glaive"
+        "recipe": "progression:refined_shovel"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_aluminum",
+      "has_refined",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:aluminum_glaive"
+      "progression:refined_shovel"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/rose_gold_axe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_rose_gold": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:rose_gold_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:rose_gold_axe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_rose_gold",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:rose_gold_axe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/rose_gold_hoe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_rose_gold": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:rose_gold_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:rose_gold_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_rose_gold",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:rose_gold_hoe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/rose_gold_pickaxe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_rose_gold": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:rose_gold_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:rose_gold_pickaxe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_rose_gold",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:rose_gold_pickaxe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/rose_gold_shovel.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_rose_gold": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:rose_gold_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:rose_gold_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_rose_gold",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:rose_gold_shovel"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/shock_axe.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_lead": {
+    "has_shock": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:lead_ingot"
+              "progression:shock_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:lead_claymore"
+        "recipe": "progression:shock_axe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_lead",
+      "has_shock",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:lead_claymore"
+      "progression:shock_axe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/shock_hoe.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_lead": {
+    "has_shock": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:lead_ingot"
+              "progression:shock_ingot"
             ]
           }
         ]
@@ -15,20 +15,20 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:lead_chakram"
+        "recipe": "progression:shock_hoe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_lead",
+      "has_shock",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:lead_chakram"
+      "progression:shock_hoe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/shock_pickaxe.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_shock": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:shock_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:shock_pickaxe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_shock",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:shock_pickaxe"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/shock_shovel.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_shock": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "progression:shock_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:shock_shovel"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_shock",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "progression:shock_shovel"
+    ]
+  },
+  "sends_telemetry_event": false
+}

common/src/generated/data/progression/advancements/recipes/tools/steel_axe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_spear"
+        "recipe": "progression:steel_axe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_spear"
+      "progression:steel_axe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/steel_hoe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_sai"
+        "recipe": "progression:steel_hoe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_sai"
+      "progression:steel_hoe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/steel_pickaxe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_glaive"
+        "recipe": "progression:steel_pickaxe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_glaive"
+      "progression:steel_pickaxe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/steel_shovel.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "tfmg:steel_ingot"
+              "progression:steel_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:steel_cutlass"
+        "recipe": "progression:steel_shovel"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:steel_cutlass"
+      "progression:steel_shovel"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/sturdy_axe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_sai"
+        "recipe": "progression:sturdy_axe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_sai"
+      "progression:sturdy_axe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/sturdy_hoe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_spear"
+        "recipe": "progression:sturdy_hoe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_spear"
+      "progression:sturdy_hoe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/sturdy_pickaxe.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_claymore"
+        "recipe": "progression:sturdy_pickaxe"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_claymore"
+      "progression:sturdy_pickaxe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/sturdy_shovel.json

@@ -6,7 +6,7 @@
         "items": [
           {
             "items": [
-              "create:sturdy_sheet"
+              "progression:sturdy_ingot"
             ]
           }
         ]
@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "simplycompat:sturdy_halberd"
+        "recipe": "progression:sturdy_shovel"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:sturdy_halberd"
+      "progression:sturdy_shovel"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/void_axe.json

@@ -1,34 +1,34 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_lead": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_axe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:lead_ingot"
+              "progression:void_ingot"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "simplycompat:lead_spear"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_lead",
+      "has_void",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:lead_spear"
+      "progression:void_axe"
     ]
   },
   "sends_telemetry_event": false

common/src/generated/data/progression/advancements/recipes/tools/void_hoe.json

@@ -1,34 +1,34 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_lead": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "progression:void_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_void": {
       "conditions": {
         "items": [
           {
             "items": [
-              "tfmg:lead_ingot"
+              "progression:void_ingot"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "simplycompat:lead_sai"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_lead",
+      "has_void",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "simplycompat:lead_sai"
+      "progression:void_hoe"
     ]
   },
   "sends_telemetry_event": false