diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..65326bb --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use nix \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3f9b1f3..c467079 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ classes/ .settings *.launch .architectury-transformer -/common/src/generated/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +/common/src/generated/.cache diff --git a/.tool-versions b/.tool-versions index 3e40019..8ad3693 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1 @@ java openjdk-17 -gradle 8.8 diff --git a/.vscode/launch.json b/.vscode/launch.json index a9227c9..f3c0ecb 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,29 +3,19 @@ "configurations": [ { "type": "java", - "name": "Minecraft Client (:fabric)", - "request": "launch", - "cwd": "${workspaceFolder}/fabric/run", - "console": "integratedTerminal", - "stopOnEntry": false, - "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" + "request": "attach", + "name": "Attach to Forge Client", + "hostName": "localhost", + "port": 5005, + "preLaunchTask": "Forge: runClient (fish) with Debug" }, { "type": "java", - "name": "Minecraft Server (:fabric)", - "request": "launch", - "cwd": "${workspaceFolder}/fabric/run", - "console": "integratedTerminal", - "stopOnEntry": false, - "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" + "request": "attach", + "name": "Attach to Fabric Client", + "hostName": "localhost", + "port": 5005, + "preLaunchTask": "Fabric: runClient (fish) with Debug" } ] -} \ No newline at end of file +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 72b9edc..3a321d4 100644 --- a/.vscode/settings.json +++ b/.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" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..acfb055 --- /dev/null +++ b/.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}" + } + } + ] +} diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/copper_boots.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/copper_boots.json index 6418c1e..e3c1ec5 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_claymore.json b/common/src/generated/data/progression/advancements/recipes/combat/copper_chestplate.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_claymore.json rename to common/src/generated/data/progression/advancements/recipes/combat/copper_chestplate.json index b90e90a..5b1f6b4 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_claymore.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_katana.json b/common/src/generated/data/progression/advancements/recipes/combat/copper_helmet.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_katana.json rename to common/src/generated/data/progression/advancements/recipes/combat/copper_helmet.json index af1a1a0..921719d 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_katana.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_chakram.json b/common/src/generated/data/progression/advancements/recipes/combat/copper_leggings.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_chakram.json rename to common/src/generated/data/progression/advancements/recipes/combat/copper_leggings.json index 85abd04..48e8f2b 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/copper_sword.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/copper_sword.json index 3978a9a..cb1bed0 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_sai.json b/common/src/generated/data/progression/advancements/recipes/combat/echo_boots.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/echo_sai.json rename to common/src/generated/data/progression/advancements/recipes/combat/echo_boots.json index c115205..43520d2 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/echo_chestplate.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/echo_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/echo_chestplate.json index 67edac3..0c1b109 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/echo_helmet.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/echo_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/echo_helmet.json index b2f8d65..9b7ba08 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_katana.json b/common/src/generated/data/progression/advancements/recipes/combat/echo_leggings.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/echo_katana.json rename to common/src/generated/data/progression/advancements/recipes/combat/echo_leggings.json index c4bd30b..134e3e0 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_katana.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/echo_sword.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/echo_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/echo_sword.json index 30f4804..2cf942e 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_sai.json b/common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_boots.json similarity index 78% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_sai.json rename to common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_boots.json index 063fc64..bcc1e13 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_chakram.json b/common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_chestplate.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_chakram.json rename to common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_chestplate.json index 3aff404..19eacd3 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_helmet.json similarity index 78% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_helmet.json index 240913c..b97ae1d 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_leggings.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_leggings.json index b2a0a19..d884948 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_sword.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/exposed_copper_sword.json index c6ed9ec..8799d4c 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_sai.json b/common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_boots.json similarity index 78% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_sai.json rename to common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_boots.json index 085b066..dd9baa3 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_chakram.json b/common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_chestplate.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_chakram.json rename to common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_chestplate.json index 522c599..6d6c2a7 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_helmet.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_helmet.json index 5f65d25..4d7db0f 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_leggings.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_leggings.json index 2faecd6..7fc96f4 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_sword.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/oxidized_copper_sword.json index 514703f..7063904 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/refined_boots.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/refined_boots.json index a8b366f..b52eac7 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_spear.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/refined_chestplate.json b/common/src/generated/data/progression/advancements/recipes/combat/refined_chestplate.json new file mode 100644 index 0000000..f752847 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_katana.json b/common/src/generated/data/progression/advancements/recipes/combat/refined_helmet.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_katana.json rename to common/src/generated/data/progression/advancements/recipes/combat/refined_helmet.json index 60010be..057f8a0 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_katana.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_claymore.json b/common/src/generated/data/progression/advancements/recipes/combat/refined_leggings.json similarity index 73% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_claymore.json rename to common/src/generated/data/progression/advancements/recipes/combat/refined_leggings.json index 936d678..dfcdbd0 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_claymore.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/refined_sword.json b/common/src/generated/data/progression/advancements/recipes/combat/refined_sword.json new file mode 100644 index 0000000..0cd36e8 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_sai.json b/common/src/generated/data/progression/advancements/recipes/combat/rose_gold_boots.json similarity index 79% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_sai.json rename to common/src/generated/data/progression/advancements/recipes/combat/rose_gold_boots.json index 87b82e3..62b2060 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/rose_gold_chestplate.json similarity index 79% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/rose_gold_chestplate.json index 5ac080c..f9061d8 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/rose_gold_helmet.json similarity index 78% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/rose_gold_helmet.json index 03dc173..a29279e 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/rose_gold_leggings.json similarity index 78% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/rose_gold_leggings.json index 5f507d2..cd7dbdc 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_glaive.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/rose_gold_sword.json b/common/src/generated/data/progression/advancements/recipes/combat/rose_gold_sword.json new file mode 100644 index 0000000..a1eb982 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/combat/shock_sword.json b/common/src/generated/data/progression/advancements/recipes/combat/shock_sword.json new file mode 100644 index 0000000..f1c4b8a --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_chakram.json b/common/src/generated/data/progression/advancements/recipes/combat/steel_boots.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_chakram.json rename to common/src/generated/data/progression/advancements/recipes/combat/steel_boots.json index 214db88..8e88d2c 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_chakram.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/steel_chestplate.json b/common/src/generated/data/progression/advancements/recipes/combat/steel_chestplate.json new file mode 100644 index 0000000..3018d48 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_claymore.json b/common/src/generated/data/progression/advancements/recipes/combat/steel_helmet.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_claymore.json rename to common/src/generated/data/progression/advancements/recipes/combat/steel_helmet.json index 75171b7..99db8e6 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_claymore.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/steel_leggings.json b/common/src/generated/data/progression/advancements/recipes/combat/steel_leggings.json new file mode 100644 index 0000000..d0cd8d5 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_halberd.json b/common/src/generated/data/progression/advancements/recipes/combat/steel_sword.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_halberd.json rename to common/src/generated/data/progression/advancements/recipes/combat/steel_sword.json index 93749ca..5bdcc67 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_halberd.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_katana.json b/common/src/generated/data/progression/advancements/recipes/combat/sturdy_boots.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_katana.json rename to common/src/generated/data/progression/advancements/recipes/combat/sturdy_boots.json index 06eb2f0..233e4c7 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_katana.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/sturdy_chestplate.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/sturdy_chestplate.json index ac25192..1dbbfd2 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_chakram.json b/common/src/generated/data/progression/advancements/recipes/combat/sturdy_helmet.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_chakram.json rename to common/src/generated/data/progression/advancements/recipes/combat/sturdy_helmet.json index 1903100..a0fb358 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_cutlass.json b/common/src/generated/data/progression/advancements/recipes/combat/sturdy_leggings.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_cutlass.json rename to common/src/generated/data/progression/advancements/recipes/combat/sturdy_leggings.json index 8b674cc..4b5637f 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_cutlass.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/sturdy_sword.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/sturdy_sword.json index 6f2cda9..0de4764 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_cutlass.json b/common/src/generated/data/progression/advancements/recipes/combat/void_boots.json similarity index 76% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/lead_cutlass.json rename to common/src/generated/data/progression/advancements/recipes/combat/void_boots.json index 96e3e1e..137b15e 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_cutlass.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/void_chestplate.json b/common/src/generated/data/progression/advancements/recipes/combat/void_chestplate.json new file mode 100644 index 0000000..7ea1382 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/combat/void_helmet.json b/common/src/generated/data/progression/advancements/recipes/combat/void_helmet.json new file mode 100644 index 0000000..ebd982c --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/combat/void_leggings.json b/common/src/generated/data/progression/advancements/recipes/combat/void_leggings.json new file mode 100644 index 0000000..34833a8 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/void_sword.json similarity index 76% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/lead_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/void_sword.json index f1af6bc..6050073 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_sai.json b/common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_boots.json similarity index 78% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_sai.json rename to common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_boots.json index f47d94f..28a80f1 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_chakram.json b/common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_chestplate.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_chakram.json rename to common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_chestplate.json index c80c661..9862dd0 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_spear.json b/common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_helmet.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_spear.json rename to common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_helmet.json index e91ec85..135b431 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_leggings.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_leggings.json index ad657d5..bf81f2b 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_glaive.json b/common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_sword.json similarity index 77% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_glaive.json rename to common/src/generated/data/progression/advancements/recipes/combat/weathered_copper_sword.json index 7ba09e9..71a088c 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_glaive.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/whither_boots.json b/common/src/generated/data/progression/advancements/recipes/combat/whither_boots.json new file mode 100644 index 0000000..532bf37 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/combat/whither_chestplate.json b/common/src/generated/data/progression/advancements/recipes/combat/whither_chestplate.json new file mode 100644 index 0000000..4dbfcff --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_rapier.json b/common/src/generated/data/progression/advancements/recipes/combat/whither_helmet.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_rapier.json rename to common/src/generated/data/progression/advancements/recipes/combat/whither_helmet.json index 6f08191..781ea8c 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_rapier.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_cutlass.json b/common/src/generated/data/progression/advancements/recipes/combat/whither_leggings.json similarity index 73% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_cutlass.json rename to common/src/generated/data/progression/advancements/recipes/combat/whither_leggings.json index 2245c21..67ce77d 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_cutlass.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/combat/whither_sword.json b/common/src/generated/data/progression/advancements/recipes/combat/whither_sword.json new file mode 100644 index 0000000..f2d7386 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_sai.json b/common/src/generated/data/progression/advancements/recipes/tools/copper_axe.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_sai.json rename to common/src/generated/data/progression/advancements/recipes/tools/copper_axe.json index 5fc946d..b210dae 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_glaive.json b/common/src/generated/data/progression/advancements/recipes/tools/copper_hoe.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_glaive.json rename to common/src/generated/data/progression/advancements/recipes/tools/copper_hoe.json index ef8034d..52581cf 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_cutlass.json b/common/src/generated/data/progression/advancements/recipes/tools/copper_pickaxe.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/copper_cutlass.json rename to common/src/generated/data/progression/advancements/recipes/tools/copper_pickaxe.json index 2cc5464..157147d 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_cutlass.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/tools/copper_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/copper_shovel.json new file mode 100644 index 0000000..4c673fc --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/echo_axe.json b/common/src/generated/data/progression/advancements/recipes/tools/echo_axe.json new file mode 100644 index 0000000..72b5210 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/echo_hoe.json b/common/src/generated/data/progression/advancements/recipes/tools/echo_hoe.json new file mode 100644 index 0000000..40d9dab --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/echo_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/echo_pickaxe.json new file mode 100644 index 0000000..6296f39 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/echo_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/echo_shovel.json new file mode 100644 index 0000000..7792ddc --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_axe.json b/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_axe.json new file mode 100644 index 0000000..5981839 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_hoe.json b/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_hoe.json new file mode 100644 index 0000000..981934e --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_pickaxe.json new file mode 100644 index 0000000..5ba8c4c --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/exposed_copper_shovel.json new file mode 100644 index 0000000..408e805 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_axe.json b/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_axe.json new file mode 100644 index 0000000..65691fb --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_hoe.json b/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_hoe.json new file mode 100644 index 0000000..5d889f4 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_pickaxe.json new file mode 100644 index 0000000..822cca2 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/oxidized_copper_shovel.json new file mode 100644 index 0000000..ddfa38c --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_sai.json b/common/src/generated/data/progression/advancements/recipes/tools/refined_axe.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_sai.json rename to common/src/generated/data/progression/advancements/recipes/tools/refined_axe.json index febfcc7..c2fd944 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_chakram.json b/common/src/generated/data/progression/advancements/recipes/tools/refined_hoe.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/echo_chakram.json rename to common/src/generated/data/progression/advancements/recipes/tools/refined_hoe.json index fdef131..529ef68 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_chakram.json b/common/src/generated/data/progression/advancements/recipes/tools/refined_pickaxe.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_chakram.json rename to common/src/generated/data/progression/advancements/recipes/tools/refined_pickaxe.json index 09e1896..50408d8 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_chakram.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_glaive.json b/common/src/generated/data/progression/advancements/recipes/tools/refined_shovel.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_glaive.json rename to common/src/generated/data/progression/advancements/recipes/tools/refined_shovel.json index 3aabbfc..f338265 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_glaive.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_axe.json b/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_axe.json new file mode 100644 index 0000000..b27baf4 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_hoe.json b/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_hoe.json new file mode 100644 index 0000000..db35b8d --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_pickaxe.json new file mode 100644 index 0000000..a8fe92c --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/rose_gold_shovel.json new file mode 100644 index 0000000..f7cc85b --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_claymore.json b/common/src/generated/data/progression/advancements/recipes/tools/shock_axe.json similarity index 76% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/lead_claymore.json rename to common/src/generated/data/progression/advancements/recipes/tools/shock_axe.json index 6667a3f..1d388a1 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_claymore.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_chakram.json b/common/src/generated/data/progression/advancements/recipes/tools/shock_hoe.json similarity index 76% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/lead_chakram.json rename to common/src/generated/data/progression/advancements/recipes/tools/shock_hoe.json index dbcb989..9df8645 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_chakram.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/tools/shock_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/shock_pickaxe.json new file mode 100644 index 0000000..2caac3a --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/shock_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/shock_shovel.json new file mode 100644 index 0000000..0a26607 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_spear.json b/common/src/generated/data/progression/advancements/recipes/tools/steel_axe.json similarity index 82% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_spear.json rename to common/src/generated/data/progression/advancements/recipes/tools/steel_axe.json index 2736d30..44dd201 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_sai.json b/common/src/generated/data/progression/advancements/recipes/tools/steel_hoe.json similarity index 82% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_sai.json rename to common/src/generated/data/progression/advancements/recipes/tools/steel_hoe.json index 66945d8..0c2a212 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_glaive.json b/common/src/generated/data/progression/advancements/recipes/tools/steel_pickaxe.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_glaive.json rename to common/src/generated/data/progression/advancements/recipes/tools/steel_pickaxe.json index f03f0dc..1230935 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_glaive.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_cutlass.json b/common/src/generated/data/progression/advancements/recipes/tools/steel_shovel.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/steel_cutlass.json rename to common/src/generated/data/progression/advancements/recipes/tools/steel_shovel.json index 3df25f9..02a11eb 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_cutlass.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_sai.json b/common/src/generated/data/progression/advancements/recipes/tools/sturdy_axe.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_sai.json rename to common/src/generated/data/progression/advancements/recipes/tools/sturdy_axe.json index c6a9780..b26d582 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_sai.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_spear.json b/common/src/generated/data/progression/advancements/recipes/tools/sturdy_hoe.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_spear.json rename to common/src/generated/data/progression/advancements/recipes/tools/sturdy_hoe.json index 08e6b2b..da4a286 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_claymore.json b/common/src/generated/data/progression/advancements/recipes/tools/sturdy_pickaxe.json similarity index 80% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_claymore.json rename to common/src/generated/data/progression/advancements/recipes/tools/sturdy_pickaxe.json index 16032cb..e2e7f30 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_claymore.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_halberd.json b/common/src/generated/data/progression/advancements/recipes/tools/sturdy_shovel.json similarity index 81% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_halberd.json rename to common/src/generated/data/progression/advancements/recipes/tools/sturdy_shovel.json index 85f5f8c..18ed2ed 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_halberd.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_spear.json b/common/src/generated/data/progression/advancements/recipes/tools/void_axe.json similarity index 76% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/lead_spear.json rename to common/src/generated/data/progression/advancements/recipes/tools/void_axe.json index 249c2ad..ae3969b 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_spear.json +++ b/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 diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_sai.json b/common/src/generated/data/progression/advancements/recipes/tools/void_hoe.json similarity index 76% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/lead_sai.json rename to common/src/generated/data/progression/advancements/recipes/tools/void_hoe.json index 0aea6c9..54211a8 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_sai.json +++ b/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 diff --git a/common/src/generated/data/progression/advancements/recipes/tools/void_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/void_pickaxe.json new file mode 100644 index 0000000..fafcb2c --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/void_pickaxe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:void_pickaxe" + }, + "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_pickaxe" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/void_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/void_shovel.json new file mode 100644 index 0000000..c42e96e --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/void_shovel.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:void_shovel" + }, + "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_shovel" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_axe.json b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_axe.json new file mode 100644 index 0000000..f27018a --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_axe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:weathered_copper_axe" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_weathered_copper": { + "conditions": { + "items": [ + { + "items": [ + "progression:weathered_copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_weathered_copper", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "progression:weathered_copper_axe" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_hoe.json b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_hoe.json new file mode 100644 index 0000000..823fbd6 --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_hoe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:weathered_copper_hoe" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_weathered_copper": { + "conditions": { + "items": [ + { + "items": [ + "progression:weathered_copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_weathered_copper", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "progression:weathered_copper_hoe" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_pickaxe.json b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_pickaxe.json new file mode 100644 index 0000000..754721e --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_pickaxe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:weathered_copper_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_weathered_copper": { + "conditions": { + "items": [ + { + "items": [ + "progression:weathered_copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_weathered_copper", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "progression:weathered_copper_pickaxe" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_shovel.json new file mode 100644 index 0000000..4735fb6 --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/weathered_copper_shovel.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:weathered_copper_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_weathered_copper": { + "conditions": { + "items": [ + { + "items": [ + "progression:weathered_copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_weathered_copper", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "progression:weathered_copper_shovel" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/whither_axe.json b/common/src/generated/data/progression/advancements/recipes/tools/whither_axe.json new file mode 100644 index 0000000..bae77e9 --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/whither_axe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:whither_axe" + }, + "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_axe" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/progression/advancements/recipes/tools/whither_hoe.json b/common/src/generated/data/progression/advancements/recipes/tools/whither_hoe.json new file mode 100644 index 0000000..ce42d70 --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/whither_hoe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:whither_hoe" + }, + "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_hoe" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_halberd.json b/common/src/generated/data/progression/advancements/recipes/tools/whither_pickaxe.json similarity index 74% rename from common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_halberd.json rename to common/src/generated/data/progression/advancements/recipes/tools/whither_pickaxe.json index 257424a..7addc63 100644 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_halberd.json +++ b/common/src/generated/data/progression/advancements/recipes/tools/whither_pickaxe.json @@ -1,34 +1,34 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:whither_pickaxe" + }, + "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_halberd" - }, - "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_aluminum", + "has_whither", "has_the_recipe" ] ], "rewards": { "recipes": [ - "simplycompat:aluminum_halberd" + "progression:whither_pickaxe" ] }, "sends_telemetry_event": false diff --git a/common/src/generated/data/progression/advancements/recipes/tools/whither_shovel.json b/common/src/generated/data/progression/advancements/recipes/tools/whither_shovel.json new file mode 100644 index 0000000..7452606 --- /dev/null +++ b/common/src/generated/data/progression/advancements/recipes/tools/whither_shovel.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "progression:whither_shovel" + }, + "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_shovel" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_sai.json b/common/src/generated/data/progression/recipes/copper_axe.json similarity index 56% rename from common/src/generated/data/simplycompat/recipes/aluminum_sai.json rename to common/src/generated/data/progression/recipes/copper_axe.json index 5c618e2..49a9f23 100644 --- a/common/src/generated/data/simplycompat/recipes/aluminum_sai.json +++ b/common/src/generated/data/progression/recipes/copper_axe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:copper_ingot" }, - "X": { - "item": "tfmg:aluminum_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - " X", - "# " + "II", + "SI", + "S " ], "result": { - "item": "simplycompat:aluminum_sai" + "item": "progression:copper_axe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_boots.json b/common/src/generated/data/progression/recipes/copper_boots.json new file mode 100644 index 0000000..da30012 --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:copper_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_chestplate.json b/common/src/generated/data/progression/recipes/copper_chestplate.json new file mode 100644 index 0000000..a70336f --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:copper_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_helmet.json b/common/src/generated/data/progression/recipes/copper_helmet.json new file mode 100644 index 0000000..9c38115 --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:copper_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_hoe.json b/common/src/generated/data/progression/recipes/copper_hoe.json new file mode 100644 index 0000000..ab0bee1 --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:copper_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_leggings.json b/common/src/generated/data/progression/recipes/copper_leggings.json new file mode 100644 index 0000000..5ffc8ae --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:copper_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_pickaxe.json b/common/src/generated/data/progression/recipes/copper_pickaxe.json new file mode 100644 index 0000000..10fd4b7 --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:copper_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_shovel.json b/common/src/generated/data/progression/recipes/copper_shovel.json new file mode 100644 index 0000000..04dad34 --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:copper_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/copper_sword.json b/common/src/generated/data/progression/recipes/copper_sword.json new file mode 100644 index 0000000..a2b009f --- /dev/null +++ b/common/src/generated/data/progression/recipes/copper_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:copper_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_spear.json b/common/src/generated/data/progression/recipes/echo_axe.json similarity index 56% rename from common/src/generated/data/simplycompat/recipes/lead_spear.json rename to common/src/generated/data/progression/recipes/echo_axe.json index 9a11605..a57fc75 100644 --- a/common/src/generated/data/simplycompat/recipes/lead_spear.json +++ b/common/src/generated/data/progression/recipes/echo_axe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:echo_ingot" }, - "X": { - "item": "tfmg:lead_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " X", - " # ", - "# " + "II", + "SI", + "S " ], "result": { - "item": "simplycompat:lead_spear" + "item": "progression:echo_axe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/echo_boots.json b/common/src/generated/data/progression/recipes/echo_boots.json new file mode 100644 index 0000000..5264390 --- /dev/null +++ b/common/src/generated/data/progression/recipes/echo_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:echo_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:echo_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/echo_chestplate.json b/common/src/generated/data/progression/recipes/echo_chestplate.json new file mode 100644 index 0000000..93c79e4 --- /dev/null +++ b/common/src/generated/data/progression/recipes/echo_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:echo_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:echo_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/echo_helmet.json b/common/src/generated/data/progression/recipes/echo_helmet.json new file mode 100644 index 0000000..80ddccd --- /dev/null +++ b/common/src/generated/data/progression/recipes/echo_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:echo_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:echo_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_katana.json b/common/src/generated/data/progression/recipes/echo_hoe.json similarity index 56% rename from common/src/generated/data/simplycompat/recipes/lead_katana.json rename to common/src/generated/data/progression/recipes/echo_hoe.json index 41a9c7e..110d7b7 100644 --- a/common/src/generated/data/simplycompat/recipes/lead_katana.json +++ b/common/src/generated/data/progression/recipes/echo_hoe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:echo_ingot" }, - "X": { - "item": "tfmg:lead_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - "#XX", - " " + "II", + "S ", + "S " ], "result": { - "item": "simplycompat:lead_katana" + "item": "progression:echo_hoe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/echo_leggings.json b/common/src/generated/data/progression/recipes/echo_leggings.json new file mode 100644 index 0000000..d567ae2 --- /dev/null +++ b/common/src/generated/data/progression/recipes/echo_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:echo_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:echo_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/echo_pickaxe.json b/common/src/generated/data/progression/recipes/echo_pickaxe.json new file mode 100644 index 0000000..e5b043b --- /dev/null +++ b/common/src/generated/data/progression/recipes/echo_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:echo_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:echo_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/echo_shovel.json b/common/src/generated/data/progression/recipes/echo_shovel.json new file mode 100644 index 0000000..688b75d --- /dev/null +++ b/common/src/generated/data/progression/recipes/echo_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:echo_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:echo_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_sai.json b/common/src/generated/data/progression/recipes/echo_sword.json similarity index 57% rename from common/src/generated/data/simplycompat/recipes/steel_sai.json rename to common/src/generated/data/progression/recipes/echo_sword.json index 60a8a98..efc6037 100644 --- a/common/src/generated/data/simplycompat/recipes/steel_sai.json +++ b/common/src/generated/data/progression/recipes/echo_sword.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:echo_ingot" }, - "X": { - "item": "tfmg:steel_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - " X", - "# " + "I", + "I", + "S" ], "result": { - "item": "simplycompat:steel_sai" + "item": "progression:echo_sword" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_axe.json b/common/src/generated/data/progression/recipes/exposed_copper_axe.json new file mode 100644 index 0000000..61aefe7 --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:exposed_copper_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_boots.json b/common/src/generated/data/progression/recipes/exposed_copper_boots.json new file mode 100644 index 0000000..03681da --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:exposed_copper_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_chestplate.json b/common/src/generated/data/progression/recipes/exposed_copper_chestplate.json new file mode 100644 index 0000000..6c7f416 --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:exposed_copper_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_helmet.json b/common/src/generated/data/progression/recipes/exposed_copper_helmet.json new file mode 100644 index 0000000..dec5432 --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:exposed_copper_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_hoe.json b/common/src/generated/data/progression/recipes/exposed_copper_hoe.json new file mode 100644 index 0000000..380f873 --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:exposed_copper_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_leggings.json b/common/src/generated/data/progression/recipes/exposed_copper_leggings.json new file mode 100644 index 0000000..1b41cdb --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:exposed_copper_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_pickaxe.json b/common/src/generated/data/progression/recipes/exposed_copper_pickaxe.json new file mode 100644 index 0000000..3baf10c --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:exposed_copper_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_shovel.json b/common/src/generated/data/progression/recipes/exposed_copper_shovel.json new file mode 100644 index 0000000..f4a1d8d --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:exposed_copper_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/exposed_copper_sword.json b/common/src/generated/data/progression/recipes/exposed_copper_sword.json new file mode 100644 index 0000000..30d5c5b --- /dev/null +++ b/common/src/generated/data/progression/recipes/exposed_copper_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:exposed_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:exposed_copper_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_axe.json b/common/src/generated/data/progression/recipes/oxidized_copper_axe.json new file mode 100644 index 0000000..e1989f8 --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:oxidized_copper_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_boots.json b/common/src/generated/data/progression/recipes/oxidized_copper_boots.json new file mode 100644 index 0000000..47ab6ca --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:oxidized_copper_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_chestplate.json b/common/src/generated/data/progression/recipes/oxidized_copper_chestplate.json new file mode 100644 index 0000000..fb78fee --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:oxidized_copper_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_helmet.json b/common/src/generated/data/progression/recipes/oxidized_copper_helmet.json new file mode 100644 index 0000000..c6c1628 --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:oxidized_copper_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_hoe.json b/common/src/generated/data/progression/recipes/oxidized_copper_hoe.json new file mode 100644 index 0000000..5195665 --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:oxidized_copper_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_leggings.json b/common/src/generated/data/progression/recipes/oxidized_copper_leggings.json new file mode 100644 index 0000000..4fdf37f --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:oxidized_copper_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_pickaxe.json b/common/src/generated/data/progression/recipes/oxidized_copper_pickaxe.json new file mode 100644 index 0000000..8396d46 --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:oxidized_copper_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_shovel.json b/common/src/generated/data/progression/recipes/oxidized_copper_shovel.json new file mode 100644 index 0000000..98a00bf --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:oxidized_copper_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/oxidized_copper_sword.json b/common/src/generated/data/progression/recipes/oxidized_copper_sword.json new file mode 100644 index 0000000..f802e78 --- /dev/null +++ b/common/src/generated/data/progression/recipes/oxidized_copper_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:oxidized_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:oxidized_copper_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_axe.json b/common/src/generated/data/progression/recipes/refined_axe.json new file mode 100644 index 0000000..538b8d6 --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:refined_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_boots.json b/common/src/generated/data/progression/recipes/refined_boots.json new file mode 100644 index 0000000..56568fb --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:refined_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_chestplate.json b/common/src/generated/data/progression/recipes/refined_chestplate.json new file mode 100644 index 0000000..6b9e2aa --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:refined_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_helmet.json b/common/src/generated/data/progression/recipes/refined_helmet.json new file mode 100644 index 0000000..33630eb --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:refined_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_hoe.json b/common/src/generated/data/progression/recipes/refined_hoe.json new file mode 100644 index 0000000..31c9716 --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:refined_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_leggings.json b/common/src/generated/data/progression/recipes/refined_leggings.json new file mode 100644 index 0000000..e6565f0 --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:refined_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_longsword.json b/common/src/generated/data/progression/recipes/refined_pickaxe.json similarity index 54% rename from common/src/generated/data/simplycompat/recipes/aluminum_longsword.json rename to common/src/generated/data/progression/recipes/refined_pickaxe.json index a05cd04..a90c0aa 100644 --- a/common/src/generated/data/simplycompat/recipes/aluminum_longsword.json +++ b/common/src/generated/data/progression/recipes/refined_pickaxe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:refined_ingot" }, - "X": { - "item": "tfmg:aluminum_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - "# ", - " X ", - " X" + "III", + " S ", + " S " ], "result": { - "item": "simplycompat:aluminum_longsword" + "item": "progression:refined_pickaxe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/refined_shovel.json b/common/src/generated/data/progression/recipes/refined_shovel.json new file mode 100644 index 0000000..5c38b4c --- /dev/null +++ b/common/src/generated/data/progression/recipes/refined_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:refined_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:refined_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_sai.json b/common/src/generated/data/progression/recipes/refined_sword.json similarity index 56% rename from common/src/generated/data/simplycompat/recipes/copper_sai.json rename to common/src/generated/data/progression/recipes/refined_sword.json index a6c15b5..e4e2053 100644 --- a/common/src/generated/data/simplycompat/recipes/copper_sai.json +++ b/common/src/generated/data/progression/recipes/refined_sword.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:refined_ingot" }, - "X": { - "item": "minecraft:copper_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - " X", - "# " + "I", + "I", + "S" ], "result": { - "item": "simplycompat:copper_sai" + "item": "progression:refined_sword" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_rapier.json b/common/src/generated/data/progression/recipes/rose_gold_axe.json similarity index 55% rename from common/src/generated/data/simplycompat/recipes/aluminum_rapier.json rename to common/src/generated/data/progression/recipes/rose_gold_axe.json index 9935512..312064a 100644 --- a/common/src/generated/data/simplycompat/recipes/aluminum_rapier.json +++ b/common/src/generated/data/progression/recipes/rose_gold_axe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:rose_gold_ingot" }, - "X": { - "item": "tfmg:aluminum_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " X", - " X ", - "# " + "II", + "SI", + "S " ], "result": { - "item": "simplycompat:aluminum_rapier" + "item": "progression:rose_gold_axe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/rose_gold_boots.json b/common/src/generated/data/progression/recipes/rose_gold_boots.json new file mode 100644 index 0000000..35ac71c --- /dev/null +++ b/common/src/generated/data/progression/recipes/rose_gold_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:rose_gold_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:rose_gold_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/rose_gold_chestplate.json b/common/src/generated/data/progression/recipes/rose_gold_chestplate.json new file mode 100644 index 0000000..ea8affc --- /dev/null +++ b/common/src/generated/data/progression/recipes/rose_gold_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:rose_gold_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:rose_gold_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/rose_gold_helmet.json b/common/src/generated/data/progression/recipes/rose_gold_helmet.json new file mode 100644 index 0000000..acaec3e --- /dev/null +++ b/common/src/generated/data/progression/recipes/rose_gold_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:rose_gold_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:rose_gold_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_katana.json b/common/src/generated/data/progression/recipes/rose_gold_hoe.json similarity index 55% rename from common/src/generated/data/simplycompat/recipes/aluminum_katana.json rename to common/src/generated/data/progression/recipes/rose_gold_hoe.json index b3ae10e..f44762e 100644 --- a/common/src/generated/data/simplycompat/recipes/aluminum_katana.json +++ b/common/src/generated/data/progression/recipes/rose_gold_hoe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:rose_gold_ingot" }, - "X": { - "item": "tfmg:aluminum_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - "#XX", - " " + "II", + "S ", + "S " ], "result": { - "item": "simplycompat:aluminum_katana" + "item": "progression:rose_gold_hoe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/rose_gold_leggings.json b/common/src/generated/data/progression/recipes/rose_gold_leggings.json new file mode 100644 index 0000000..87460f4 --- /dev/null +++ b/common/src/generated/data/progression/recipes/rose_gold_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:rose_gold_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:rose_gold_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/rose_gold_pickaxe.json b/common/src/generated/data/progression/recipes/rose_gold_pickaxe.json new file mode 100644 index 0000000..a64cab3 --- /dev/null +++ b/common/src/generated/data/progression/recipes/rose_gold_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:rose_gold_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:rose_gold_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_glaive.json b/common/src/generated/data/progression/recipes/rose_gold_shovel.json similarity index 55% rename from common/src/generated/data/simplycompat/recipes/aluminum_glaive.json rename to common/src/generated/data/progression/recipes/rose_gold_shovel.json index 47550a3..dad855b 100644 --- a/common/src/generated/data/simplycompat/recipes/aluminum_glaive.json +++ b/common/src/generated/data/progression/recipes/rose_gold_shovel.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:rose_gold_ingot" }, - "X": { - "item": "tfmg:aluminum_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " X", - " #X", - "# " + "I", + "S", + "S" ], "result": { - "item": "simplycompat:aluminum_glaive" + "item": "progression:rose_gold_shovel" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_spear.json b/common/src/generated/data/progression/recipes/rose_gold_sword.json similarity index 55% rename from common/src/generated/data/simplycompat/recipes/aluminum_spear.json rename to common/src/generated/data/progression/recipes/rose_gold_sword.json index 002b4b6..fd0ce58 100644 --- a/common/src/generated/data/simplycompat/recipes/aluminum_spear.json +++ b/common/src/generated/data/progression/recipes/rose_gold_sword.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:rose_gold_ingot" }, - "X": { - "item": "tfmg:aluminum_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " X", - " # ", - "# " + "I", + "I", + "S" ], "result": { - "item": "simplycompat:aluminum_spear" + "item": "progression:rose_gold_sword" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_glaive.json b/common/src/generated/data/progression/recipes/shock_axe.json similarity index 56% rename from common/src/generated/data/simplycompat/recipes/lead_glaive.json rename to common/src/generated/data/progression/recipes/shock_axe.json index ff99d45..28cfa53 100644 --- a/common/src/generated/data/simplycompat/recipes/lead_glaive.json +++ b/common/src/generated/data/progression/recipes/shock_axe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:shock_ingot" }, - "X": { - "item": "tfmg:lead_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " X", - " #X", - "# " + "II", + "SI", + "S " ], "result": { - "item": "simplycompat:lead_glaive" + "item": "progression:shock_axe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_rapier.json b/common/src/generated/data/progression/recipes/shock_hoe.json similarity index 56% rename from common/src/generated/data/simplycompat/recipes/lead_rapier.json rename to common/src/generated/data/progression/recipes/shock_hoe.json index f5521ca..bad94ee 100644 --- a/common/src/generated/data/simplycompat/recipes/lead_rapier.json +++ b/common/src/generated/data/progression/recipes/shock_hoe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:shock_ingot" }, - "X": { - "item": "tfmg:lead_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " X", - " X ", - "# " + "II", + "S ", + "S " ], "result": { - "item": "simplycompat:lead_rapier" + "item": "progression:shock_hoe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_sai.json b/common/src/generated/data/progression/recipes/shock_pickaxe.json similarity index 55% rename from common/src/generated/data/simplycompat/recipes/echo_sai.json rename to common/src/generated/data/progression/recipes/shock_pickaxe.json index 7063005..e7a6c61 100644 --- a/common/src/generated/data/simplycompat/recipes/echo_sai.json +++ b/common/src/generated/data/progression/recipes/shock_pickaxe.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:shock_ingot" }, - "X": { - "item": "create_deep_dark:echo_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - " X", - "# " + "III", + " S ", + " S " ], "result": { - "item": "simplycompat:echo_sai" + "item": "progression:shock_pickaxe" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/shock_shovel.json b/common/src/generated/data/progression/recipes/shock_shovel.json new file mode 100644 index 0000000..499d601 --- /dev/null +++ b/common/src/generated/data/progression/recipes/shock_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:shock_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:shock_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/shock_sword.json b/common/src/generated/data/progression/recipes/shock_sword.json new file mode 100644 index 0000000..693b5d4 --- /dev/null +++ b/common/src/generated/data/progression/recipes/shock_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:shock_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:shock_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_axe.json b/common/src/generated/data/progression/recipes/steel_axe.json new file mode 100644 index 0000000..87b9c95 --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:steel_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_boots.json b/common/src/generated/data/progression/recipes/steel_boots.json new file mode 100644 index 0000000..7726a2c --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:steel_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_chestplate.json b/common/src/generated/data/progression/recipes/steel_chestplate.json new file mode 100644 index 0000000..80cccfc --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:steel_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_helmet.json b/common/src/generated/data/progression/recipes/steel_helmet.json new file mode 100644 index 0000000..c66510c --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:steel_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_hoe.json b/common/src/generated/data/progression/recipes/steel_hoe.json new file mode 100644 index 0000000..df62d43 --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:steel_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_leggings.json b/common/src/generated/data/progression/recipes/steel_leggings.json new file mode 100644 index 0000000..25ec008 --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:steel_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_pickaxe.json b/common/src/generated/data/progression/recipes/steel_pickaxe.json new file mode 100644 index 0000000..3357320 --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:steel_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_shovel.json b/common/src/generated/data/progression/recipes/steel_shovel.json new file mode 100644 index 0000000..9013edc --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:steel_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/steel_sword.json b/common/src/generated/data/progression/recipes/steel_sword.json new file mode 100644 index 0000000..53a0c79 --- /dev/null +++ b/common/src/generated/data/progression/recipes/steel_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:steel_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:steel_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_axe.json b/common/src/generated/data/progression/recipes/sturdy_axe.json new file mode 100644 index 0000000..10a9013 --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:sturdy_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_boots.json b/common/src/generated/data/progression/recipes/sturdy_boots.json new file mode 100644 index 0000000..2a42fc9 --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:sturdy_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_chestplate.json b/common/src/generated/data/progression/recipes/sturdy_chestplate.json new file mode 100644 index 0000000..20323ae --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:sturdy_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_helmet.json b/common/src/generated/data/progression/recipes/sturdy_helmet.json new file mode 100644 index 0000000..c52d782 --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:sturdy_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_hoe.json b/common/src/generated/data/progression/recipes/sturdy_hoe.json new file mode 100644 index 0000000..c7af5aa --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:sturdy_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_leggings.json b/common/src/generated/data/progression/recipes/sturdy_leggings.json new file mode 100644 index 0000000..f99e0e7 --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:sturdy_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_pickaxe.json b/common/src/generated/data/progression/recipes/sturdy_pickaxe.json new file mode 100644 index 0000000..c4aa129 --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:sturdy_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_shovel.json b/common/src/generated/data/progression/recipes/sturdy_shovel.json new file mode 100644 index 0000000..fcece72 --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:sturdy_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/sturdy_sword.json b/common/src/generated/data/progression/recipes/sturdy_sword.json new file mode 100644 index 0000000..d54577d --- /dev/null +++ b/common/src/generated/data/progression/recipes/sturdy_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:sturdy_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:sturdy_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_axe.json b/common/src/generated/data/progression/recipes/void_axe.json new file mode 100644 index 0000000..9f044f8 --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:void_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_boots.json b/common/src/generated/data/progression/recipes/void_boots.json new file mode 100644 index 0000000..5fda9a6 --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:void_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_chestplate.json b/common/src/generated/data/progression/recipes/void_chestplate.json new file mode 100644 index 0000000..609bf1e --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:void_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_helmet.json b/common/src/generated/data/progression/recipes/void_helmet.json new file mode 100644 index 0000000..e503e1e --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:void_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_hoe.json b/common/src/generated/data/progression/recipes/void_hoe.json new file mode 100644 index 0000000..3624451 --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:void_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_leggings.json b/common/src/generated/data/progression/recipes/void_leggings.json new file mode 100644 index 0000000..cf283a1 --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:void_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_pickaxe.json b/common/src/generated/data/progression/recipes/void_pickaxe.json new file mode 100644 index 0000000..8fab47b --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:void_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/void_shovel.json b/common/src/generated/data/progression/recipes/void_shovel.json new file mode 100644 index 0000000..7631c3e --- /dev/null +++ b/common/src/generated/data/progression/recipes/void_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:void_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:void_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_sai.json b/common/src/generated/data/progression/recipes/void_sword.json similarity index 57% rename from common/src/generated/data/simplycompat/recipes/lead_sai.json rename to common/src/generated/data/progression/recipes/void_sword.json index 349cc7b..a7acbfc 100644 --- a/common/src/generated/data/simplycompat/recipes/lead_sai.json +++ b/common/src/generated/data/progression/recipes/void_sword.json @@ -1,22 +1,22 @@ { "type": "minecraft:crafting_shaped", "category": "equipment", - "group": "simplycompat", + "group": "progression", "key": { - "#": { - "tag": "forge:rods/wooden" + "I": { + "tag": "progression:void_ingot" }, - "X": { - "item": "tfmg:lead_ingot" + "S": { + "tag": "forge:rods/wooden" } }, "pattern": [ - " ", - " X", - "# " + "I", + "I", + "S" ], "result": { - "item": "simplycompat:lead_sai" + "item": "progression:void_sword" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_axe.json b/common/src/generated/data/progression/recipes/weathered_copper_axe.json new file mode 100644 index 0000000..8c842fa --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:weathered_copper_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_boots.json b/common/src/generated/data/progression/recipes/weathered_copper_boots.json new file mode 100644 index 0000000..e99c6c9 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:weathered_copper_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_chestplate.json b/common/src/generated/data/progression/recipes/weathered_copper_chestplate.json new file mode 100644 index 0000000..6fc1969 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:weathered_copper_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_helmet.json b/common/src/generated/data/progression/recipes/weathered_copper_helmet.json new file mode 100644 index 0000000..15ee8f1 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:weathered_copper_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_hoe.json b/common/src/generated/data/progression/recipes/weathered_copper_hoe.json new file mode 100644 index 0000000..39f5565 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:weathered_copper_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_leggings.json b/common/src/generated/data/progression/recipes/weathered_copper_leggings.json new file mode 100644 index 0000000..d8d3d33 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:weathered_copper_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_pickaxe.json b/common/src/generated/data/progression/recipes/weathered_copper_pickaxe.json new file mode 100644 index 0000000..3dc208f --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:weathered_copper_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_shovel.json b/common/src/generated/data/progression/recipes/weathered_copper_shovel.json new file mode 100644 index 0000000..275e907 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:weathered_copper_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/weathered_copper_sword.json b/common/src/generated/data/progression/recipes/weathered_copper_sword.json new file mode 100644 index 0000000..7b234c7 --- /dev/null +++ b/common/src/generated/data/progression/recipes/weathered_copper_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:weathered_copper_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:weathered_copper_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_axe.json b/common/src/generated/data/progression/recipes/whither_axe.json new file mode 100644 index 0000000..12eea5a --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_axe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "SI", + "S " + ], + "result": { + "item": "progression:whither_axe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_boots.json b/common/src/generated/data/progression/recipes/whither_boots.json new file mode 100644 index 0000000..4843bba --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_boots.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + } + }, + "pattern": [ + " ", + "I I", + "I I" + ], + "result": { + "item": "progression:whither_boots" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_chestplate.json b/common/src/generated/data/progression/recipes/whither_chestplate.json new file mode 100644 index 0000000..f1f2985 --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_chestplate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + } + }, + "pattern": [ + "I I", + "III", + "III" + ], + "result": { + "item": "progression:whither_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_helmet.json b/common/src/generated/data/progression/recipes/whither_helmet.json new file mode 100644 index 0000000..bc43bd7 --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_helmet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + } + }, + "pattern": [ + "III", + "I I", + " " + ], + "result": { + "item": "progression:whither_helmet" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_hoe.json b/common/src/generated/data/progression/recipes/whither_hoe.json new file mode 100644 index 0000000..779396f --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_hoe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "II", + "S ", + "S " + ], + "result": { + "item": "progression:whither_hoe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_leggings.json b/common/src/generated/data/progression/recipes/whither_leggings.json new file mode 100644 index 0000000..27a8d39 --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_leggings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + } + }, + "pattern": [ + "III", + "I I", + "I I" + ], + "result": { + "item": "progression:whither_leggings" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_pickaxe.json b/common/src/generated/data/progression/recipes/whither_pickaxe.json new file mode 100644 index 0000000..327ed59 --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_pickaxe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "III", + " S ", + " S " + ], + "result": { + "item": "progression:whither_pickaxe" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_shovel.json b/common/src/generated/data/progression/recipes/whither_shovel.json new file mode 100644 index 0000000..06a7286 --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_shovel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "S", + "S" + ], + "result": { + "item": "progression:whither_shovel" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/recipes/whither_sword.json b/common/src/generated/data/progression/recipes/whither_sword.json new file mode 100644 index 0000000..ca78121 --- /dev/null +++ b/common/src/generated/data/progression/recipes/whither_sword.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "progression", + "key": { + "I": { + "tag": "progression:whither_ingot" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + "I", + "I", + "S" + ], + "result": { + "item": "progression:whither_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/copper_ingot.json b/common/src/generated/data/progression/tags/items/copper_ingot.json new file mode 100644 index 0000000..d8d9f06 --- /dev/null +++ b/common/src/generated/data/progression/tags/items/copper_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:copper_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/echo_ingot.json b/common/src/generated/data/progression/tags/items/echo_ingot.json new file mode 100644 index 0000000..8517a2c --- /dev/null +++ b/common/src/generated/data/progression/tags/items/echo_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:echo_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/exposed_copper_ingot.json b/common/src/generated/data/progression/tags/items/exposed_copper_ingot.json new file mode 100644 index 0000000..b819bac --- /dev/null +++ b/common/src/generated/data/progression/tags/items/exposed_copper_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:exposed_copper_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/oxidized_copper_ingot.json b/common/src/generated/data/progression/tags/items/oxidized_copper_ingot.json new file mode 100644 index 0000000..2cc0884 --- /dev/null +++ b/common/src/generated/data/progression/tags/items/oxidized_copper_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:oxidized_copper_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/refined_ingot.json b/common/src/generated/data/progression/tags/items/refined_ingot.json new file mode 100644 index 0000000..02767fd --- /dev/null +++ b/common/src/generated/data/progression/tags/items/refined_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:refined_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/rose_gold_ingot.json b/common/src/generated/data/progression/tags/items/rose_gold_ingot.json new file mode 100644 index 0000000..0400d35 --- /dev/null +++ b/common/src/generated/data/progression/tags/items/rose_gold_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:rose_gold_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/shock_ingot.json b/common/src/generated/data/progression/tags/items/shock_ingot.json new file mode 100644 index 0000000..499e3ea --- /dev/null +++ b/common/src/generated/data/progression/tags/items/shock_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:shock_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/steel_ingot.json b/common/src/generated/data/progression/tags/items/steel_ingot.json new file mode 100644 index 0000000..ca5b4dd --- /dev/null +++ b/common/src/generated/data/progression/tags/items/steel_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:steel_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/sturdy_ingot.json b/common/src/generated/data/progression/tags/items/sturdy_ingot.json new file mode 100644 index 0000000..46cff7c --- /dev/null +++ b/common/src/generated/data/progression/tags/items/sturdy_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:sturdy_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/void_ingot.json b/common/src/generated/data/progression/tags/items/void_ingot.json new file mode 100644 index 0000000..e3f46e0 --- /dev/null +++ b/common/src/generated/data/progression/tags/items/void_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:void_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/weathered_copper_ingot.json b/common/src/generated/data/progression/tags/items/weathered_copper_ingot.json new file mode 100644 index 0000000..d1f801c --- /dev/null +++ b/common/src/generated/data/progression/tags/items/weathered_copper_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:weathered_copper_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/progression/tags/items/whither_ingot.json b/common/src/generated/data/progression/tags/items/whither_ingot.json new file mode 100644 index 0000000..cffad44 --- /dev/null +++ b/common/src/generated/data/progression/tags/items/whither_ingot.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "progression:whither_ingot", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_greataxe.json deleted file mode 100644 index 6478aa1..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aluminum": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:aluminum_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:aluminum_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_aluminum", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:aluminum_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_greathammer.json deleted file mode 100644 index 6077ced..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aluminum": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:aluminum_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:aluminum_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_aluminum", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:aluminum_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_longsword.json deleted file mode 100644 index 39a6ec4..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aluminum": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:aluminum_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:aluminum_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_aluminum", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:aluminum_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_scythe.json deleted file mode 100644 index 5e6f0af..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aluminum": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:aluminum_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:aluminum_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_aluminum", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:aluminum_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_twinblade.json deleted file mode 100644 index eb87871..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aluminum": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:aluminum_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:aluminum_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_aluminum", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:aluminum_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_warglaive.json deleted file mode 100644 index f75ab3b..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/aluminum_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aluminum": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:aluminum_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:aluminum_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_aluminum", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:aluminum_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_greataxe.json deleted file mode 100644 index 0d9caaf..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_greathammer.json deleted file mode 100644 index 05d89bc..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_halberd.json deleted file mode 100644 index 058761c..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_longsword.json deleted file mode 100644 index 86f1251..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_scythe.json deleted file mode 100644 index 9d7b216..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_twinblade.json deleted file mode 100644 index e3e25cd..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_warglaive.json deleted file mode 100644 index 9a649d8..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/copper_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_copper": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:copper_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:copper_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_claymore.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_claymore.json deleted file mode 100644 index 1f215c9..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_claymore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_claymore" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_claymore" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_cutlass.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_cutlass.json deleted file mode 100644 index e09c5a8..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_cutlass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_cutlass" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_cutlass" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_greataxe.json deleted file mode 100644 index f41e77a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_greathammer.json deleted file mode 100644 index 477e335..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_halberd.json deleted file mode 100644 index 4e1fd15..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_longsword.json deleted file mode 100644 index 9e2008f..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_scythe.json deleted file mode 100644 index bc46b59..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_twinblade.json deleted file mode 100644 index f001e22..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_warglaive.json deleted file mode 100644 index 89e156a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/echo_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_echo": { - "conditions": { - "items": [ - { - "items": [ - "create_deep_dark:echo_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:echo_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_echo", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:echo_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_claymore.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_claymore.json deleted file mode 100644 index cc193a0..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_claymore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_claymore" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_claymore" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_cutlass.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_cutlass.json deleted file mode 100644 index 8f5f42f..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_cutlass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_cutlass" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_cutlass" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_greataxe.json deleted file mode 100644 index 11b0aa7..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_greathammer.json deleted file mode 100644 index 53da5d0..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_halberd.json deleted file mode 100644 index cdf227a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_katana.json deleted file mode 100644 index e2709a9..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_katana" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_longsword.json deleted file mode 100644 index f4fa3e5..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_scythe.json deleted file mode 100644 index a5c22ba..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_twinblade.json deleted file mode 100644 index 21d3787..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_warglaive.json deleted file mode 100644 index e407e8f..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/exposed_copper_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exposed_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:exposed_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:exposed_copper_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_exposed_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:exposed_copper_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_chakram.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_chakram.json deleted file mode 100644 index 2662c46..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_chakram.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_chakram" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_chakram" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_claymore.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_claymore.json deleted file mode 100644 index ce1ac3c..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_claymore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_claymore" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_claymore" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_cutlass.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_cutlass.json deleted file mode 100644 index 97c07bb..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_cutlass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_cutlass" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_cutlass" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_glaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_glaive.json deleted file mode 100644 index 0e5a525..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_glaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_glaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_glaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_greataxe.json deleted file mode 100644 index e8319bd..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_greathammer.json deleted file mode 100644 index c1b971a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_halberd.json deleted file mode 100644 index d238f1a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_katana.json deleted file mode 100644 index 80f5a4b..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_katana" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_longsword.json deleted file mode 100644 index e483c8b..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_rapier.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_rapier.json deleted file mode 100644 index 93e4e3e..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_rapier.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_rapier" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_rapier" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_sai.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_sai.json deleted file mode 100644 index 5b9493b..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_sai.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_sai" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_sai" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_scythe.json deleted file mode 100644 index 1d09f8f..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_spear.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_spear.json deleted file mode 100644 index ba081b3..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_spear.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_spear" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_spear" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_twinblade.json deleted file mode 100644 index 97a1d0d..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_warglaive.json deleted file mode 100644 index 723dd8d..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/gilded_netherite_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_gilded_netherite": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:gilded_netherite_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_gilded_netherite", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:gilded_netherite_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_greataxe.json deleted file mode 100644 index 8a6ab33..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_greathammer.json deleted file mode 100644 index 663a4db..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_halberd.json deleted file mode 100644 index 78d1274..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_katana.json deleted file mode 100644 index 7e54ae2..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_katana" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_longsword.json deleted file mode 100644 index dd5065e..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_rapier.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_rapier.json deleted file mode 100644 index 66d7732..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_rapier.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_rapier" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_rapier" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_scythe.json deleted file mode 100644 index 0bffcb7..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_twinblade.json deleted file mode 100644 index 87324f2..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_warglaive.json deleted file mode 100644 index 0d19585..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/lead_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_lead": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:lead_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:lead_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_lead", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:lead_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_claymore.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_claymore.json deleted file mode 100644 index 99c7109..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_claymore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_claymore" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_claymore" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_cutlass.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_cutlass.json deleted file mode 100644 index 413655d..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_cutlass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_cutlass" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_cutlass" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_greataxe.json deleted file mode 100644 index d522875..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_greathammer.json deleted file mode 100644 index 503842e..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_halberd.json deleted file mode 100644 index a79a309..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_katana.json deleted file mode 100644 index 6cae182..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_katana" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_longsword.json deleted file mode 100644 index 0f22050..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_scythe.json deleted file mode 100644 index 134ad31..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_twinblade.json deleted file mode 100644 index 519be9b..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_warglaive.json deleted file mode 100644 index ec45f2f..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/oxidized_copper_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_oxidized_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:oxidized_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:oxidized_copper_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_oxidized_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:oxidized_copper_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_chakram.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_chakram.json deleted file mode 100644 index de7abda..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_chakram.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_chakram" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_chakram" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_claymore.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_claymore.json deleted file mode 100644 index 2ece166..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_claymore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_claymore" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_claymore" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_cutlass.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_cutlass.json deleted file mode 100644 index 4eadfe0..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_cutlass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_cutlass" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_cutlass" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_greataxe.json deleted file mode 100644 index 38b07df..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_greathammer.json deleted file mode 100644 index a284378..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_halberd.json deleted file mode 100644 index f95d5aa..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_katana.json deleted file mode 100644 index 37b70fb..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_katana" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_longsword.json deleted file mode 100644 index c4fff82..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_scythe.json deleted file mode 100644 index 258e165..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_twinblade.json deleted file mode 100644 index 8922b55..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_warglaive.json deleted file mode 100644 index 7cff438..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/rose_gold_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold": { - "conditions": { - "items": [ - { - "items": [ - "additionaladditions:rose_gold_alloy" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:rose_gold_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_rose_gold", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:rose_gold_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_greataxe.json deleted file mode 100644 index d00584a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_greathammer.json deleted file mode 100644 index ba15699..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_katana.json deleted file mode 100644 index 06eaaae..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_katana" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_longsword.json deleted file mode 100644 index 72d955a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_rapier.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_rapier.json deleted file mode 100644 index 74292ad..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_rapier.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_rapier" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_rapier" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_scythe.json deleted file mode 100644 index a11573a..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_twinblade.json deleted file mode 100644 index bc4452e..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_warglaive.json deleted file mode 100644 index 46db100..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/steel_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_steel": { - "conditions": { - "items": [ - { - "items": [ - "tfmg:steel_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:steel_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_steel", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:steel_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_greataxe.json deleted file mode 100644 index 501af54..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_sturdy": { - "conditions": { - "items": [ - { - "items": [ - "create:sturdy_sheet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:sturdy_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_sturdy", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:sturdy_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_greathammer.json deleted file mode 100644 index 6cfc239..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_sturdy": { - "conditions": { - "items": [ - { - "items": [ - "create:sturdy_sheet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:sturdy_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_sturdy", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:sturdy_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_longsword.json deleted file mode 100644 index 88cfd94..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_sturdy": { - "conditions": { - "items": [ - { - "items": [ - "create:sturdy_sheet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:sturdy_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_sturdy", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:sturdy_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_scythe.json deleted file mode 100644 index d879888..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_sturdy": { - "conditions": { - "items": [ - { - "items": [ - "create:sturdy_sheet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:sturdy_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_sturdy", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:sturdy_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_twinblade.json deleted file mode 100644 index 4fe8a14..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_sturdy": { - "conditions": { - "items": [ - { - "items": [ - "create:sturdy_sheet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:sturdy_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_sturdy", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:sturdy_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_warglaive.json deleted file mode 100644 index d04f455..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/sturdy_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_sturdy": { - "conditions": { - "items": [ - { - "items": [ - "create:sturdy_sheet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:sturdy_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_sturdy", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:sturdy_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_claymore.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_claymore.json deleted file mode 100644 index c6ae431..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_claymore.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_claymore" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_claymore" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_cutlass.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_cutlass.json deleted file mode 100644 index 4543b47..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_cutlass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_cutlass" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_cutlass" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_greataxe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_greataxe.json deleted file mode 100644 index cbadb42..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_greataxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_greataxe" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_greataxe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_greathammer.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_greathammer.json deleted file mode 100644 index feb00b8..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_greathammer.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_greathammer" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_greathammer" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_halberd.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_halberd.json deleted file mode 100644 index eb781e2..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_halberd.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_halberd" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_halberd" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_katana.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_katana.json deleted file mode 100644 index 2738da9..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_katana.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_katana" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_katana" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_longsword.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_longsword.json deleted file mode 100644 index 9a7db43..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_longsword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_longsword" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_longsword" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_scythe.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_scythe.json deleted file mode 100644 index eeb4853..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_scythe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_scythe" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_scythe" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_twinblade.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_twinblade.json deleted file mode 100644 index ce721a7..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_twinblade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_twinblade" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_twinblade" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_warglaive.json b/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_warglaive.json deleted file mode 100644 index 98ce2e0..0000000 --- a/common/src/generated/data/simplycompat/advancements/recipes/tools/weathered_copper_warglaive.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "simplycompat:weathered_copper_warglaive" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_weathered_copper": { - "conditions": { - "items": [ - { - "items": [ - "purecoppertools:weathered_copper_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_weathered_copper", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "simplycompat:weathered_copper_warglaive" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_chakram.json b/common/src/generated/data/simplycompat/recipes/aluminum_chakram.json deleted file mode 100644 index 6d49bb5..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:aluminum_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_claymore.json b/common/src/generated/data/simplycompat/recipes/aluminum_claymore.json deleted file mode 100644 index e3a97e5..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:aluminum_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_cutlass.json b/common/src/generated/data/simplycompat/recipes/aluminum_cutlass.json deleted file mode 100644 index 13ff8fc..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:aluminum_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_greataxe.json b/common/src/generated/data/simplycompat/recipes/aluminum_greataxe.json deleted file mode 100644 index 8785151..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:aluminum_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_greathammer.json b/common/src/generated/data/simplycompat/recipes/aluminum_greathammer.json deleted file mode 100644 index d80007f..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:aluminum_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_halberd.json b/common/src/generated/data/simplycompat/recipes/aluminum_halberd.json deleted file mode 100644 index ea1f4dd..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:aluminum_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_scythe.json b/common/src/generated/data/simplycompat/recipes/aluminum_scythe.json deleted file mode 100644 index b73bd0b..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:aluminum_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_twinblade.json b/common/src/generated/data/simplycompat/recipes/aluminum_twinblade.json deleted file mode 100644 index 932da98..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:aluminum_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/aluminum_warglaive.json b/common/src/generated/data/simplycompat/recipes/aluminum_warglaive.json deleted file mode 100644 index 5ebad22..0000000 --- a/common/src/generated/data/simplycompat/recipes/aluminum_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:aluminum_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:aluminum_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_chakram.json b/common/src/generated/data/simplycompat/recipes/copper_chakram.json deleted file mode 100644 index cc9ab63..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:copper_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_claymore.json b/common/src/generated/data/simplycompat/recipes/copper_claymore.json deleted file mode 100644 index 5f788ec..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:copper_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_cutlass.json b/common/src/generated/data/simplycompat/recipes/copper_cutlass.json deleted file mode 100644 index 0d20a1f..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:copper_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_glaive.json b/common/src/generated/data/simplycompat/recipes/copper_glaive.json deleted file mode 100644 index 4130eed..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:copper_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_greataxe.json b/common/src/generated/data/simplycompat/recipes/copper_greataxe.json deleted file mode 100644 index 3cf8eeb..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:copper_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_greathammer.json b/common/src/generated/data/simplycompat/recipes/copper_greathammer.json deleted file mode 100644 index 6a7ce7b..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:copper_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_halberd.json b/common/src/generated/data/simplycompat/recipes/copper_halberd.json deleted file mode 100644 index f06bf60..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:copper_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_katana.json b/common/src/generated/data/simplycompat/recipes/copper_katana.json deleted file mode 100644 index 70dd96e..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:copper_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_longsword.json b/common/src/generated/data/simplycompat/recipes/copper_longsword.json deleted file mode 100644 index 6a4502d..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:copper_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_rapier.json b/common/src/generated/data/simplycompat/recipes/copper_rapier.json deleted file mode 100644 index 5e781bb..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:copper_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_scythe.json b/common/src/generated/data/simplycompat/recipes/copper_scythe.json deleted file mode 100644 index 4221dfd..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:copper_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_spear.json b/common/src/generated/data/simplycompat/recipes/copper_spear.json deleted file mode 100644 index 1c566ef..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:copper_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_twinblade.json b/common/src/generated/data/simplycompat/recipes/copper_twinblade.json deleted file mode 100644 index e203abe..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:copper_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/copper_warglaive.json b/common/src/generated/data/simplycompat/recipes/copper_warglaive.json deleted file mode 100644 index 0abb73c..0000000 --- a/common/src/generated/data/simplycompat/recipes/copper_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:copper_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_chakram.json b/common/src/generated/data/simplycompat/recipes/echo_chakram.json deleted file mode 100644 index 585920e..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:echo_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_claymore.json b/common/src/generated/data/simplycompat/recipes/echo_claymore.json deleted file mode 100644 index 54829b7..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:echo_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_cutlass.json b/common/src/generated/data/simplycompat/recipes/echo_cutlass.json deleted file mode 100644 index dbfe467..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:echo_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_glaive.json b/common/src/generated/data/simplycompat/recipes/echo_glaive.json deleted file mode 100644 index 807964e..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:echo_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_greataxe.json b/common/src/generated/data/simplycompat/recipes/echo_greataxe.json deleted file mode 100644 index 02d8be8..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:echo_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_greathammer.json b/common/src/generated/data/simplycompat/recipes/echo_greathammer.json deleted file mode 100644 index f5b0475..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:echo_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_halberd.json b/common/src/generated/data/simplycompat/recipes/echo_halberd.json deleted file mode 100644 index 224a55f..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:echo_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_katana.json b/common/src/generated/data/simplycompat/recipes/echo_katana.json deleted file mode 100644 index 01553d3..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:echo_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_longsword.json b/common/src/generated/data/simplycompat/recipes/echo_longsword.json deleted file mode 100644 index f929a48..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:echo_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_rapier.json b/common/src/generated/data/simplycompat/recipes/echo_rapier.json deleted file mode 100644 index 7a3d53a..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:echo_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_scythe.json b/common/src/generated/data/simplycompat/recipes/echo_scythe.json deleted file mode 100644 index dcefcaa..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:echo_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_spear.json b/common/src/generated/data/simplycompat/recipes/echo_spear.json deleted file mode 100644 index e92edf4..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:echo_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_twinblade.json b/common/src/generated/data/simplycompat/recipes/echo_twinblade.json deleted file mode 100644 index c3d3adf..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:echo_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/echo_warglaive.json b/common/src/generated/data/simplycompat/recipes/echo_warglaive.json deleted file mode 100644 index df7229d..0000000 --- a/common/src/generated/data/simplycompat/recipes/echo_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create_deep_dark:echo_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:echo_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_chakram.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_chakram.json deleted file mode 100644 index 0615e26..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:exposed_copper_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_claymore.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_claymore.json deleted file mode 100644 index 06e7c79..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:exposed_copper_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_cutlass.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_cutlass.json deleted file mode 100644 index d38c64e..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_glaive.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_glaive.json deleted file mode 100644 index e4487cb..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_greataxe.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_greataxe.json deleted file mode 100644 index 2a18f3c..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:exposed_copper_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_greathammer.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_greathammer.json deleted file mode 100644 index 89f8bf0..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:exposed_copper_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_halberd.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_halberd.json deleted file mode 100644 index 089ac63..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_katana.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_katana.json deleted file mode 100644 index b0c9fc7..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:exposed_copper_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_longsword.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_longsword.json deleted file mode 100644 index 8c8442d..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:exposed_copper_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_rapier.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_rapier.json deleted file mode 100644 index 620ec0e..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_sai.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_sai.json deleted file mode 100644 index a9d26d7..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_sai.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - " ", - " X", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_sai" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_scythe.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_scythe.json deleted file mode 100644 index 9c0486d..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_spear.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_spear.json deleted file mode 100644 index 9bb396b..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:exposed_copper_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_twinblade.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_twinblade.json deleted file mode 100644 index ba70bd6..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:exposed_copper_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/exposed_copper_warglaive.json b/common/src/generated/data/simplycompat/recipes/exposed_copper_warglaive.json deleted file mode 100644 index e7e2ae1..0000000 --- a/common/src/generated/data/simplycompat/recipes/exposed_copper_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:exposed_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:exposed_copper_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_chakram.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_chakram.json deleted file mode 100644 index 8525e27..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:gilded_netherite_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_claymore.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_claymore.json deleted file mode 100644 index e8de017..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:gilded_netherite_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_cutlass.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_cutlass.json deleted file mode 100644 index e3fa879..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_glaive.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_glaive.json deleted file mode 100644 index 9d2bb8c..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_greataxe.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_greataxe.json deleted file mode 100644 index 0e839ec..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:gilded_netherite_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_greathammer.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_greathammer.json deleted file mode 100644 index cb93ee2..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:gilded_netherite_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_halberd.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_halberd.json deleted file mode 100644 index b4db50d..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_katana.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_katana.json deleted file mode 100644 index b220de7..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:gilded_netherite_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_longsword.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_longsword.json deleted file mode 100644 index 1508045..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:gilded_netherite_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_rapier.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_rapier.json deleted file mode 100644 index 7d77093..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_sai.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_sai.json deleted file mode 100644 index b0509f2..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_sai.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - " ", - " X", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_sai" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_scythe.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_scythe.json deleted file mode 100644 index ecd7172..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_spear.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_spear.json deleted file mode 100644 index 9bcaafc..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:gilded_netherite_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_twinblade.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_twinblade.json deleted file mode 100644 index 21efedb..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:gilded_netherite_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/gilded_netherite_warglaive.json b/common/src/generated/data/simplycompat/recipes/gilded_netherite_warglaive.json deleted file mode 100644 index 539124d..0000000 --- a/common/src/generated/data/simplycompat/recipes/gilded_netherite_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:netherite_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:gilded_netherite_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_chakram.json b/common/src/generated/data/simplycompat/recipes/lead_chakram.json deleted file mode 100644 index 98d8072..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:lead_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_claymore.json b/common/src/generated/data/simplycompat/recipes/lead_claymore.json deleted file mode 100644 index afc9bbc..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:lead_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_cutlass.json b/common/src/generated/data/simplycompat/recipes/lead_cutlass.json deleted file mode 100644 index e07c9ed..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:lead_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_greataxe.json b/common/src/generated/data/simplycompat/recipes/lead_greataxe.json deleted file mode 100644 index a6ef6fc..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:lead_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_greathammer.json b/common/src/generated/data/simplycompat/recipes/lead_greathammer.json deleted file mode 100644 index 5b5335c..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:lead_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_halberd.json b/common/src/generated/data/simplycompat/recipes/lead_halberd.json deleted file mode 100644 index 69db1dd..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:lead_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_longsword.json b/common/src/generated/data/simplycompat/recipes/lead_longsword.json deleted file mode 100644 index 336d643..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:lead_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_scythe.json b/common/src/generated/data/simplycompat/recipes/lead_scythe.json deleted file mode 100644 index 69f93d8..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:lead_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_twinblade.json b/common/src/generated/data/simplycompat/recipes/lead_twinblade.json deleted file mode 100644 index 6aab6d8..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:lead_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/lead_warglaive.json b/common/src/generated/data/simplycompat/recipes/lead_warglaive.json deleted file mode 100644 index 3229197..0000000 --- a/common/src/generated/data/simplycompat/recipes/lead_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:lead_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:lead_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_chakram.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_chakram.json deleted file mode 100644 index d7123e6..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:oxidized_copper_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_claymore.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_claymore.json deleted file mode 100644 index abd17d0..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:oxidized_copper_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_cutlass.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_cutlass.json deleted file mode 100644 index bc8c555..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_glaive.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_glaive.json deleted file mode 100644 index e2e0c1a..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_greataxe.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_greataxe.json deleted file mode 100644 index a86d4bb..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:oxidized_copper_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_greathammer.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_greathammer.json deleted file mode 100644 index 388f992..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:oxidized_copper_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_halberd.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_halberd.json deleted file mode 100644 index dcf99a5..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_katana.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_katana.json deleted file mode 100644 index 4f56cba..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:oxidized_copper_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_longsword.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_longsword.json deleted file mode 100644 index e098fa5..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:oxidized_copper_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_rapier.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_rapier.json deleted file mode 100644 index 6780ea5..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_sai.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_sai.json deleted file mode 100644 index 78dc44e..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_sai.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - " ", - " X", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_sai" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_scythe.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_scythe.json deleted file mode 100644 index f52459d..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_spear.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_spear.json deleted file mode 100644 index 2f5eea6..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:oxidized_copper_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_twinblade.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_twinblade.json deleted file mode 100644 index 684f90e..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:oxidized_copper_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/oxidized_copper_warglaive.json b/common/src/generated/data/simplycompat/recipes/oxidized_copper_warglaive.json deleted file mode 100644 index d261a0b..0000000 --- a/common/src/generated/data/simplycompat/recipes/oxidized_copper_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:oxidized_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:oxidized_copper_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_chakram.json b/common/src/generated/data/simplycompat/recipes/rose_gold_chakram.json deleted file mode 100644 index 2335a64..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:rose_gold_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_claymore.json b/common/src/generated/data/simplycompat/recipes/rose_gold_claymore.json deleted file mode 100644 index b44aeb4..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:rose_gold_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_cutlass.json b/common/src/generated/data/simplycompat/recipes/rose_gold_cutlass.json deleted file mode 100644 index 5cdf4ca..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_glaive.json b/common/src/generated/data/simplycompat/recipes/rose_gold_glaive.json deleted file mode 100644 index 72c3cb4..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_greataxe.json b/common/src/generated/data/simplycompat/recipes/rose_gold_greataxe.json deleted file mode 100644 index 0f69781..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:rose_gold_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_greathammer.json b/common/src/generated/data/simplycompat/recipes/rose_gold_greathammer.json deleted file mode 100644 index 9e05131..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:rose_gold_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_halberd.json b/common/src/generated/data/simplycompat/recipes/rose_gold_halberd.json deleted file mode 100644 index 43b3f4f..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_katana.json b/common/src/generated/data/simplycompat/recipes/rose_gold_katana.json deleted file mode 100644 index 636f321..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:rose_gold_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_longsword.json b/common/src/generated/data/simplycompat/recipes/rose_gold_longsword.json deleted file mode 100644 index b19509f..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:rose_gold_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_rapier.json b/common/src/generated/data/simplycompat/recipes/rose_gold_rapier.json deleted file mode 100644 index 4b80ab4..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_sai.json b/common/src/generated/data/simplycompat/recipes/rose_gold_sai.json deleted file mode 100644 index 45dc845..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_sai.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - " ", - " X", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_sai" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_scythe.json b/common/src/generated/data/simplycompat/recipes/rose_gold_scythe.json deleted file mode 100644 index c34475f..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_spear.json b/common/src/generated/data/simplycompat/recipes/rose_gold_spear.json deleted file mode 100644 index c05c00a..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:rose_gold_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_twinblade.json b/common/src/generated/data/simplycompat/recipes/rose_gold_twinblade.json deleted file mode 100644 index 016c162..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:rose_gold_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/rose_gold_warglaive.json b/common/src/generated/data/simplycompat/recipes/rose_gold_warglaive.json deleted file mode 100644 index 8f1ec1a..0000000 --- a/common/src/generated/data/simplycompat/recipes/rose_gold_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "additionaladditions:rose_gold_alloy" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:rose_gold_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_chakram.json b/common/src/generated/data/simplycompat/recipes/steel_chakram.json deleted file mode 100644 index dd1860b..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:steel_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_claymore.json b/common/src/generated/data/simplycompat/recipes/steel_claymore.json deleted file mode 100644 index 03ae858..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:steel_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_cutlass.json b/common/src/generated/data/simplycompat/recipes/steel_cutlass.json deleted file mode 100644 index 805ea7a..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:steel_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_glaive.json b/common/src/generated/data/simplycompat/recipes/steel_glaive.json deleted file mode 100644 index bcf8b44..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:steel_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_greataxe.json b/common/src/generated/data/simplycompat/recipes/steel_greataxe.json deleted file mode 100644 index a5a4dec..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:steel_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_greathammer.json b/common/src/generated/data/simplycompat/recipes/steel_greathammer.json deleted file mode 100644 index ed08b78..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:steel_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_halberd.json b/common/src/generated/data/simplycompat/recipes/steel_halberd.json deleted file mode 100644 index b2b7193..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:steel_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_katana.json b/common/src/generated/data/simplycompat/recipes/steel_katana.json deleted file mode 100644 index 1a1cdd0..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:steel_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_longsword.json b/common/src/generated/data/simplycompat/recipes/steel_longsword.json deleted file mode 100644 index 6c2323c..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:steel_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_rapier.json b/common/src/generated/data/simplycompat/recipes/steel_rapier.json deleted file mode 100644 index 2d0c95a..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:steel_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_scythe.json b/common/src/generated/data/simplycompat/recipes/steel_scythe.json deleted file mode 100644 index 24798d7..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:steel_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_spear.json b/common/src/generated/data/simplycompat/recipes/steel_spear.json deleted file mode 100644 index 6fa9dcb..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:steel_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_twinblade.json b/common/src/generated/data/simplycompat/recipes/steel_twinblade.json deleted file mode 100644 index bee05e4..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:steel_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/steel_warglaive.json b/common/src/generated/data/simplycompat/recipes/steel_warglaive.json deleted file mode 100644 index 45b1005..0000000 --- a/common/src/generated/data/simplycompat/recipes/steel_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "tfmg:steel_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:steel_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_chakram.json b/common/src/generated/data/simplycompat/recipes/sturdy_chakram.json deleted file mode 100644 index 1b668d9..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:sturdy_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_claymore.json b/common/src/generated/data/simplycompat/recipes/sturdy_claymore.json deleted file mode 100644 index 4549548..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:sturdy_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_cutlass.json b/common/src/generated/data/simplycompat/recipes/sturdy_cutlass.json deleted file mode 100644 index 5e0f8f8..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:sturdy_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_glaive.json b/common/src/generated/data/simplycompat/recipes/sturdy_glaive.json deleted file mode 100644 index d31cba9..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:sturdy_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_greataxe.json b/common/src/generated/data/simplycompat/recipes/sturdy_greataxe.json deleted file mode 100644 index 717790e..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:sturdy_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_greathammer.json b/common/src/generated/data/simplycompat/recipes/sturdy_greathammer.json deleted file mode 100644 index 91936ee..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:sturdy_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_halberd.json b/common/src/generated/data/simplycompat/recipes/sturdy_halberd.json deleted file mode 100644 index cb4744d..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:sturdy_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_katana.json b/common/src/generated/data/simplycompat/recipes/sturdy_katana.json deleted file mode 100644 index 0f81e8b..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:sturdy_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_longsword.json b/common/src/generated/data/simplycompat/recipes/sturdy_longsword.json deleted file mode 100644 index 6156bae..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:sturdy_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_rapier.json b/common/src/generated/data/simplycompat/recipes/sturdy_rapier.json deleted file mode 100644 index 4be39cc..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:sturdy_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_sai.json b/common/src/generated/data/simplycompat/recipes/sturdy_sai.json deleted file mode 100644 index 82eccea..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_sai.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - " ", - " X", - "# " - ], - "result": { - "item": "simplycompat:sturdy_sai" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_scythe.json b/common/src/generated/data/simplycompat/recipes/sturdy_scythe.json deleted file mode 100644 index af4a8a8..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:sturdy_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_spear.json b/common/src/generated/data/simplycompat/recipes/sturdy_spear.json deleted file mode 100644 index 65d7f28..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:sturdy_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_twinblade.json b/common/src/generated/data/simplycompat/recipes/sturdy_twinblade.json deleted file mode 100644 index 2f93969..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:sturdy_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/sturdy_warglaive.json b/common/src/generated/data/simplycompat/recipes/sturdy_warglaive.json deleted file mode 100644 index 6fc5e7e..0000000 --- a/common/src/generated/data/simplycompat/recipes/sturdy_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "create:sturdy_sheet" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:sturdy_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_chakram.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_chakram.json deleted file mode 100644 index e465c72..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_chakram.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "YXY", - "X X", - "Y#Y" - ], - "result": { - "item": "simplycompat:weathered_copper_chakram" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_claymore.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_claymore.json deleted file mode 100644 index 2fe41d7..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_claymore.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " YX", - "YXY", - "#Y " - ], - "result": { - "item": "simplycompat:weathered_copper_claymore" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_cutlass.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_cutlass.json deleted file mode 100644 index f789287..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_cutlass.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y", - "XX", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_cutlass" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_glaive.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_glaive.json deleted file mode 100644 index 9ccbcb8..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_glaive.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - " X", - " #X", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_glaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_greataxe.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_greataxe.json deleted file mode 100644 index f8b217b..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_greataxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "Y#Y", - " # " - ], - "result": { - "item": "simplycompat:weathered_copper_greataxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_greathammer.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_greathammer.json deleted file mode 100644 index 5844de1..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_greathammer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - "XXX", - "YYY", - " # " - ], - "result": { - "item": "simplycompat:weathered_copper_greathammer" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_halberd.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_halberd.json deleted file mode 100644 index 66898a3..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_halberd.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " XY", - "X#X", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_halberd" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_katana.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_katana.json deleted file mode 100644 index f92e5df..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_katana.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - " ", - "#XX", - " " - ], - "result": { - "item": "simplycompat:weathered_copper_katana" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_longsword.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_longsword.json deleted file mode 100644 index 92b53b6..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_longsword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - "# ", - " X ", - " X" - ], - "result": { - "item": "simplycompat:weathered_copper_longsword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_rapier.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_rapier.json deleted file mode 100644 index 33f0d51..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_rapier.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - " X", - " X ", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_rapier" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_sai.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_sai.json deleted file mode 100644 index 8865597..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_sai.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - " ", - " X", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_sai" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_scythe.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_scythe.json deleted file mode 100644 index 81a9998..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_scythe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - "XX#", - "X# ", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_scythe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_spear.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_spear.json deleted file mode 100644 index 77975f5..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_spear.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "# " - ], - "result": { - "item": "simplycompat:weathered_copper_spear" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_twinblade.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_twinblade.json deleted file mode 100644 index 8043826..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_twinblade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - } - }, - "pattern": [ - " X", - " # ", - "X " - ], - "result": { - "item": "simplycompat:weathered_copper_twinblade" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/generated/data/simplycompat/recipes/weathered_copper_warglaive.json b/common/src/generated/data/simplycompat/recipes/weathered_copper_warglaive.json deleted file mode 100644 index fd7fb47..0000000 --- a/common/src/generated/data/simplycompat/recipes/weathered_copper_warglaive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "simplycompat", - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "purecoppertools:weathered_copper_ingot" - }, - "Y": { - "item": "minecraft:iron_nugget" - } - }, - "pattern": [ - " Y ", - "X#X", - " " - ], - "result": { - "item": "simplycompat:weathered_copper_warglaive" - }, - "show_notification": true -} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/progression/Progression.java b/common/src/main/java/cc/toph/progression/Progression.java new file mode 100644 index 0000000..e6ea151 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/Progression.java @@ -0,0 +1,17 @@ +package cc.toph.progression; + +import cc.toph.progression.registry.CompatRegistry; +import cc.toph.progression.registry.ConfigRegistry; +import cc.toph.progression.registry.ItemsRegistry; +import cc.toph.progression.registry.TabRegistry; + +public final class Progression { + + public static void init() { + TabRegistry.registerTabs(); + ConfigRegistry.registerConfigs(); + ItemsRegistry.registerItems(); + CompatRegistry.registerCompats(); + } + +} diff --git a/common/src/main/java/cc/toph/simplycompat/SimplyCompatPlatform.java b/common/src/main/java/cc/toph/progression/ProgressionPlatform.java similarity index 88% rename from common/src/main/java/cc/toph/simplycompat/SimplyCompatPlatform.java rename to common/src/main/java/cc/toph/progression/ProgressionPlatform.java index 27bda26..07a65a6 100644 --- a/common/src/main/java/cc/toph/simplycompat/SimplyCompatPlatform.java +++ b/common/src/main/java/cc/toph/progression/ProgressionPlatform.java @@ -1,10 +1,10 @@ -package cc.toph.simplycompat; +package cc.toph.progression; import dev.architectury.injectables.annotations.ExpectPlatform; import java.nio.file.Path; -public class SimplyCompatPlatform { +public class ProgressionPlatform { @ExpectPlatform public static Path getConfigDirectory() { diff --git a/common/src/main/java/cc/toph/simplycompat/config/Config.java b/common/src/main/java/cc/toph/progression/config/Config.java similarity index 97% rename from common/src/main/java/cc/toph/simplycompat/config/Config.java rename to common/src/main/java/cc/toph/progression/config/Config.java index fde3019..a846fd6 100644 --- a/common/src/main/java/cc/toph/simplycompat/config/Config.java +++ b/common/src/main/java/cc/toph/progression/config/Config.java @@ -1,4 +1,4 @@ -package cc.toph.simplycompat.config; +package cc.toph.progression.config; public class Config { private final SimpleConfig config; diff --git a/common/src/main/java/cc/toph/simplycompat/config/ConfigProvider.java b/common/src/main/java/cc/toph/progression/config/ConfigProvider.java similarity index 87% rename from common/src/main/java/cc/toph/simplycompat/config/ConfigProvider.java rename to common/src/main/java/cc/toph/progression/config/ConfigProvider.java index efe820e..4616634 100644 --- a/common/src/main/java/cc/toph/simplycompat/config/ConfigProvider.java +++ b/common/src/main/java/cc/toph/progression/config/ConfigProvider.java @@ -1,6 +1,6 @@ -package cc.toph.simplycompat.config; +package cc.toph.progression.config; -import cc.toph.simplycompat.SimplyCompatPlatform; +import cc.toph.progression.ProgressionPlatform; import java.util.HashMap; @@ -11,7 +11,7 @@ public class ConfigProvider implements SimpleConfig.DefaultConfig { ## Simply Compat Config ## Version: %s - """, SimplyCompatPlatform.getVersion()); + """, ProgressionPlatform.getVersion()); public ConfigProvider(String namespace) { this.namespace = namespace; diff --git a/common/src/main/java/cc/toph/simplycompat/config/SimpleConfig.java b/common/src/main/java/cc/toph/progression/config/SimpleConfig.java similarity index 96% rename from common/src/main/java/cc/toph/simplycompat/config/SimpleConfig.java rename to common/src/main/java/cc/toph/progression/config/SimpleConfig.java index 60f24d8..eb9b32d 100644 --- a/common/src/main/java/cc/toph/simplycompat/config/SimpleConfig.java +++ b/common/src/main/java/cc/toph/progression/config/SimpleConfig.java @@ -1,4 +1,4 @@ -package cc.toph.simplycompat.config; +package cc.toph.progression.config; /* * Copyright (c) 2021 magistermaks * @@ -21,8 +21,8 @@ package cc.toph.simplycompat.config; * THE SOFTWARE. */ -import cc.toph.simplycompat.SimplyCompat; -import cc.toph.simplycompat.SimplyCompatPlatform; +import cc.toph.progression.ProgressionPlatform; +import cc.toph.progression.util.Constants; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Scanner; -import static cc.toph.simplycompat.SimplyCompat.LOGGER; +import static cc.toph.progression.util.Constants.LOGGER; public class SimpleConfig { @@ -82,7 +82,7 @@ public class SimpleConfig { // File // Path path = SimplyCompatExpectPlatform.getConfigDirectory().resolve(filename + FILE_EXTENSION); // Folder - Path path = SimplyCompatPlatform.getConfigDirectory().resolve(String.format("%s/%s%s", SimplyCompat.MOD_ID, filename, FILE_EXTENSION)); + Path path = ProgressionPlatform.getConfigDirectory().resolve(String.format("%s/%s%s", Constants.MOD_ID, filename, FILE_EXTENSION)); return new ConfigRequest(path.toFile(), filename); } diff --git a/common/src/main/java/cc/toph/progression/effect/CopperFever.java b/common/src/main/java/cc/toph/progression/effect/CopperFever.java new file mode 100644 index 0000000..16cf88a --- /dev/null +++ b/common/src/main/java/cc/toph/progression/effect/CopperFever.java @@ -0,0 +1,10 @@ +package cc.toph.progression.effect; + +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; + +public class CopperFever extends MobEffect { + protected CopperFever(MobEffectCategory category, int color) { + super(category, color); + } +} diff --git a/common/src/main/java/cc/toph/progression/item/ItemSpec.java b/common/src/main/java/cc/toph/progression/item/ItemSpec.java new file mode 100644 index 0000000..66f9ebe --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/ItemSpec.java @@ -0,0 +1,11 @@ +package cc.toph.progression.item; + +import net.minecraft.resources.ResourceLocation; + +public interface ItemSpec { + + ResourceLocation getLocation(); + + // Return the actual tool instance + E getItemInstance(); +} diff --git a/common/src/main/java/cc/toph/progression/item/armor/Armor.java b/common/src/main/java/cc/toph/progression/item/armor/Armor.java new file mode 100644 index 0000000..18bbbf6 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/armor/Armor.java @@ -0,0 +1,33 @@ +package cc.toph.progression.item.armor; + +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ArmorTier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ArmorItem; +import org.jetbrains.annotations.NotNull; + +// !!! Might not be needed +public class Armor extends ArmorItem implements ItemSpec { + public Armor(ArmorTier tier, Type type, Properties properties) { + super(tier, type, properties); + } + + @Override + public @NotNull ArmorTier getMaterial() { + return (ArmorTier) this.material; + } + + public @NotNull ArmorTier getTier() { + return getMaterial(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public Armor getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/armor/UltimateArmor.java b/common/src/main/java/cc/toph/progression/item/armor/UltimateArmor.java new file mode 100644 index 0000000..e393450 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/armor/UltimateArmor.java @@ -0,0 +1,27 @@ +package cc.toph.progression.item.armor; + +import cc.toph.progression.item.tier.ArmorTier; +import cc.toph.progression.item.tier.ultimate.Ultimate; + +public class UltimateArmor extends Armor { + + private Ultimate ultimate; + private int cooldown; + + public UltimateArmor(ArmorTier tier, Type type, Properties properties, Ultimate ultimate) { + super(tier, type, properties); + this.ultimate = ultimate; + } + + // This probably don't even go here, since all four types of armor should not fire the same event + void useUltimate() { +// ultimate.handleUse(); + // TODO: keep track of cooldown + cooldown = ultimate.getBaseCooldown(); + } + + @Override + public UltimateArmor getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/ingot/Compound.java b/common/src/main/java/cc/toph/progression/item/ingot/Compound.java new file mode 100644 index 0000000..75313da --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/ingot/Compound.java @@ -0,0 +1,31 @@ +package cc.toph.progression.item.ingot; + +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.ItemStack; + +public class Compound extends Ingot { + + private Ingot wannabe; + + public Compound(Properties properties, Ingot wannabe) { + super(properties); + } + + // Todo: Implement onEntityItemUpdate Mixin + // Example: https://discord.com/channels/507304429255393322/507982478276034570/1329824482646429748 + // and: https://github.com/Fabricators-of-Create/Porting-Lib/blob/c42ad24ca1ecab323bfbfcb8b79e4a2c8e10bb61/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemEntityMixin.java#L22 + public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) { + return false; + } + + private void mutate(ItemStack stack, ItemEntity entity) { + ItemStack wannabeStack = new ItemStack(wannabe); + wannabeStack.setCount(stack.getCount()); + entity.setItem(wannabeStack); + } + + @Override + public Compound getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/ingot/Ingot.java b/common/src/main/java/cc/toph/progression/item/ingot/Ingot.java new file mode 100644 index 0000000..da3fa4c --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/ingot/Ingot.java @@ -0,0 +1,22 @@ +package cc.toph.progression.item.ingot; + +import cc.toph.progression.item.ItemSpec; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; + +public class Ingot extends Item implements ItemSpec { + + public Ingot(Properties properties) { + super(properties); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public Ingot getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/ingot/Spawnable.java b/common/src/main/java/cc/toph/progression/item/ingot/Spawnable.java new file mode 100644 index 0000000..80f8123 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/ingot/Spawnable.java @@ -0,0 +1,16 @@ +package cc.toph.progression.item.ingot; + +public class Spawnable extends Ingot { + public Spawnable(Properties properties) { + super(properties); + } + + // TODO: Spawn animation + public void spawn() { + } + + @Override + public Spawnable getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/tier/ArmorTier.java b/common/src/main/java/cc/toph/progression/item/tier/ArmorTier.java new file mode 100644 index 0000000..4e334d9 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tier/ArmorTier.java @@ -0,0 +1,262 @@ +package cc.toph.progression.item.tier; + +import cc.toph.progression.registry.ConfigRegistry; +import cc.toph.progression.registry.ConfigRegistry.TIER_ATTRIBUTES; +import cc.toph.progression.tag.Tags; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import org.jetbrains.annotations.NotNull; + +public enum ArmorTier implements Material, ArmorMaterial { + COPPER( + DurabilityRecord.fromMultiplier(10), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_GENERIC, + Tags.ITEMS.COPPER_INGOT.tag(), + 0f, + 0f, + ConfigRegistry.TIER_ATTRIBUTES.COPPER_ENABLED + ), + EXPOSED_COPPER( + DurabilityRecord.fromMultiplier(14), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_GENERIC, + Tags.ITEMS.EXPOSED_COPPER_INGOT.tag(), + 0f, + 0f, + ConfigRegistry.TIER_ATTRIBUTES.COPPER_ENABLED + ), + WEATHERED_COPPER( + DurabilityRecord.fromMultiplier(18), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_GENERIC, + Tags.ITEMS.WEATHERED_COPPER_INGOT.tag(), + 0f, + 0f, + ConfigRegistry.TIER_ATTRIBUTES.COPPER_ENABLED + ), + OXIDIZED_COPPER( + DurabilityRecord.fromMultiplier(20), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_GENERIC, + Tags.ITEMS.OXIDIZED_COPPER_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ), + ROSE_GOLD( + DurabilityRecord.fromMultiplier(15), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_GOLD, + Tags.ITEMS.ROSE_GOLD_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ), + STURDY( + DurabilityRecord.fromMultiplier(39), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_NETHERITE, + Tags.ITEMS.STURDY_INGOT.tag(), + 0f, + 0f, + ConfigRegistry.TIER_ATTRIBUTES.COPPER_ENABLED + ), + STEEL( + DurabilityRecord.fromMultiplier(33), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_IRON, + Tags.ITEMS.STEEL_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ), + REFINED( + DurabilityRecord.fromMultiplier(42), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_DIAMOND, + Tags.ITEMS.REFINED_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ), + ECHO( + DurabilityRecord.fromMultiplier(42), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_DIAMOND, + Tags.ITEMS.ECHO_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ), + WHITHER( + DurabilityRecord.fromMultiplier(42), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_DIAMOND, + Tags.ITEMS.WHITHER_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ), + VOID( + DurabilityRecord.fromMultiplier(42), + new DefenseRecord(2, 3, 4, 2), + 25, + SoundEvents.ARMOR_EQUIP_DIAMOND, + Tags.ITEMS.VOID_INGOT.tag(), + 0f, + 0f, + TIER_ATTRIBUTES.COPPER_ENABLED + ); + + private final DurabilityRecord durabilityRecord; + private final DefenseRecord defenseRecord; + private final int enchantmentValue; + private final SoundEvent getEquipSound; + private final TagKey repairIngredient; + private final float toughness; + private final float knockbackResistance; + private final boolean enabled; + // TODO: Armor Full Effect + // TODO: Armor Ability + + ArmorTier( + DurabilityRecord durabilityRecord, + DefenseRecord defenseRecord, + int enchantmentValue, + SoundEvent getEquipSound, + TagKey repairIngredient, + float toughness, + float knockbackResistance, + boolean enabled + ) { + this.durabilityRecord = durabilityRecord; + this.defenseRecord = defenseRecord; + this.enchantmentValue = enchantmentValue; + this.getEquipSound = getEquipSound; + this.repairIngredient = repairIngredient; + this.toughness = toughness; + this.knockbackResistance = knockbackResistance; + this.enabled = enabled; + // TODO: Armor Full Effect + // TODO: Armor Ability + } + + @Override + public int getDurabilityForType(ArmorItem.Type type) { + return switch (type.getName()) { + case "helmet" -> durabilityRecord.helmet(); + case "chestplate" -> durabilityRecord.chestplate(); + case "leggings" -> durabilityRecord.leggings(); + case "boots" -> durabilityRecord.boots(); + default -> 0; + }; + } + + @Override + public int getDefenseForType(ArmorItem.Type type) { + return switch (type.getName()) { + case "helmet" -> defenseRecord.helmet(); + case "chestplate" -> defenseRecord.chestplate(); + case "leggings" -> defenseRecord.leggings(); + case "boots" -> defenseRecord.boots(); + default -> 0; + }; + } + + @Override + public int getEnchantmentValue() { + return enchantmentValue; + } + + @Override + public @NotNull SoundEvent getEquipSound() { + return getEquipSound; + } + + @Override + public @NotNull Ingredient getRepairIngredient() { + return Ingredient.of(repairIngredient); + } + + @Override + public @NotNull String getName() { + return this.name().toLowerCase(); + } + + @Override + public float getToughness() { + return toughness; + } + + @Override + public float getKnockbackResistance() { + return knockbackResistance; + } + + @Override + public ResourceLocation getIngredientLocation() { + return repairIngredient.location(); + } + + @Override + public TagKey getIngredientTag() { + return repairIngredient; + } + + @Override + public Item getIngredientAsItem() { + return BuiltInRegistries.ITEM.get(repairIngredient.location()); + } + + @Override + public boolean isEnabled() { + return enabled; + } + + @Override + public ArmorTier[] getValues() { + return values(); + } + + protected record DurabilityRecord( + int boots, + int leggings, + int chestplate, + int helmet) { + + public static DurabilityRecord fromMultiplier(int multiplier) { + return new DurabilityRecord( + 13 * multiplier, + 15 * multiplier, + 16 * multiplier, + 11 * multiplier + ); + } + } + + protected record DefenseRecord( + int boots, + int leggings, + int chestplate, + int helmet) { + } + +} diff --git a/common/src/main/java/cc/toph/simplycompat/util/ToolMaterials.java b/common/src/main/java/cc/toph/progression/item/tier/Material.java similarity index 57% rename from common/src/main/java/cc/toph/simplycompat/util/ToolMaterials.java rename to common/src/main/java/cc/toph/progression/item/tier/Material.java index 2d38b86..c3e0664 100644 --- a/common/src/main/java/cc/toph/simplycompat/util/ToolMaterials.java +++ b/common/src/main/java/cc/toph/progression/item/tier/Material.java @@ -1,7 +1,8 @@ -package cc.toph.simplycompat.util; +package cc.toph.progression.item.tier; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Tier; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; /** @@ -12,8 +13,7 @@ import net.minecraft.world.item.Tier; *

* Suggested implementation with Enums */ -public interface ToolMaterials & ToolMaterials> - extends Tier { +public interface Material & Material> { /** * Returns the name of the enum constant in lowercase. @@ -23,23 +23,21 @@ public interface ToolMaterials & ToolMaterials> String getName(); /** - * Returns RepairIngredient ResourceLocation as a string + * Returns RepairIngredient ResourceLocation * - * @return String ResourceLocation Path (mod:item) + * @return ResourceLocation (mod:item) */ - String getIdentifier(); - - /** - * Retrieves the base damage modifier associated with the tool material. - *

- * Simply Swords specific value, not related to {@link Tier#getAttackDamageBonus()} - * - * @return the base damage modifier as a float value - */ - float getDamageModifier(); - ResourceLocation getIngredientLocation(); + Item getIngredientAsItem(); + + /* + * Returns RepairIngredient ResourceLocation + * + * @return ResourceLocation (mod:item) + */ + TagKey getIngredientTag(); + /** * Checks if Material has been enabled * diff --git a/common/src/main/java/cc/toph/progression/item/tier/ToolTier.java b/common/src/main/java/cc/toph/progression/item/tier/ToolTier.java new file mode 100644 index 0000000..e99b9b8 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tier/ToolTier.java @@ -0,0 +1,250 @@ +package cc.toph.progression.item.tier; + +import cc.toph.progression.registry.ConfigRegistry.TIER_ATTRIBUTES; +import cc.toph.progression.tag.Tags; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.Ingredient; +import org.jetbrains.annotations.NotNull; + +// TODO: change ingredients to tags, and correct one +public enum ToolTier implements Material, Tier { + COPPER( + 0, + 184, + 3.0F, + 1.5f, + TIER_ATTRIBUTES.COPPER, + 22, + Tags.ITEMS.COPPER_INGOT.tag(), + TIER_ATTRIBUTES.COPPER_ENABLED + ), + EXPOSED_COPPER( + 0, + 218, + 3.0f, + 2.0f, + TIER_ATTRIBUTES.EXPOSED_COPPER, + 18, + + Tags.ITEMS.EXPOSED_COPPER_INGOT.tag(), + TIER_ATTRIBUTES.EXPOSED_COPPER_ENABLED + ), + WEATHERED_COPPER( + 0, + 258, + 3.5f, + 2.5f, + TIER_ATTRIBUTES.WEATHERED_COPPER, + 14, + + Tags.ITEMS.WEATHERED_COPPER_INGOT.tag(), + TIER_ATTRIBUTES.WEATHERED_COPPER_ENABLED + ), + OXIDIZED_COPPER( + 0, + 304, + 4.0f, + 3.0f, + TIER_ATTRIBUTES.OXIDIZED_COPPER, + 10, + + Tags.ITEMS.OXIDIZED_COPPER_INGOT.tag(), + TIER_ATTRIBUTES.OXIDIZED_COPPER_ENABLED + ), + ROSE_GOLD( + 2, + 900, + 9.0f, + 2.0F, + TIER_ATTRIBUTES.ROSE_GOLD, + 17, + + Tags.ITEMS.ROSE_GOLD_INGOT.tag(), + TIER_ATTRIBUTES.ROSE_GOLD_ENABLED + ), + STURDY( + 3, + 1800, + 8.0f, + 3.5f, + TIER_ATTRIBUTES.STURDY, + 14, + + Tags.ITEMS.STURDY_INGOT.tag(), + TIER_ATTRIBUTES.STURDY_ENABLED + ), + STEEL( + 3, + 1200, + 7.5F, + 3.0F, + TIER_ATTRIBUTES.STEEL, + 12, + + Tags.ITEMS.STEEL_INGOT.tag(), + TIER_ATTRIBUTES.STEEL_ENABLED + ), + REFINED( + 4, + 2300, + 10.0F, + 4.5F, + TIER_ATTRIBUTES.REFINED, + 20, + + Tags.ITEMS.REFINED_INGOT.tag(), + TIER_ATTRIBUTES.REFINED_ENABLED + ), + ECHO( + 4, + 2300, + 10.0f, + 4.5F, + TIER_ATTRIBUTES.ECHO, + 20, + + Tags.ITEMS.ECHO_INGOT.tag(), + TIER_ATTRIBUTES.ECHO_ENABLED + ), + WHITHER( + 4, + 2300, + 10.0F, + 4.5F, + TIER_ATTRIBUTES.WHITHER, + 20, + + Tags.ITEMS.WHITHER_INGOT.tag(), + TIER_ATTRIBUTES.WHITHER_ENABLED + ), + VOID( + 4, + 2300, + 10.0F, + 4.5F, + TIER_ATTRIBUTES.VOID, + 20, + + Tags.ITEMS.VOID_INGOT.tag(), + TIER_ATTRIBUTES.VOID_ENABLED + ), + SHOCK( + 4, + 2300, + 10.0F, + 4.5F, + TIER_ATTRIBUTES.SHOCK, + 20, + + Tags.ITEMS.SHOCK_INGOT.tag(), + TIER_ATTRIBUTES.SHOCK_ENABLED + ); + + private final int level; + private final int uses; + private final float speed; + private final float attackDamageBonus; + private final float damageModifier; + private final int enchantmentValue; + private final TagKey repairIngredient; + private final boolean enabled; + + ToolTier( + int level, + int uses, + float speed, + float attackDamageBonus, + float damageModifier, + int enchantmentValue, + TagKey repairIngredient, + boolean enabled + ) { + this.level = level; + this.uses = uses; + this.speed = speed; + this.attackDamageBonus = attackDamageBonus; + this.enchantmentValue = enchantmentValue; + this.damageModifier = damageModifier; + this.repairIngredient = repairIngredient; + this.enabled = enabled; + // TODO: Tool Effect + // TODO: Weapon Effect + } + + + @Override + public String getName() { + return this.name().toLowerCase(); + } + + @Override + public int getUses() { + return uses; + } + + @Override + public float getSpeed() { + return speed; + } + + @Override + public float getAttackDamageBonus() { + return attackDamageBonus; + } + + /** + * Retrieves the base damage modifier associated with the tool material. + *

+ * Simply Swords specific value, not related to {@link Tier#getAttackDamageBonus()} + * + * @return the base damage modifier as a float value + */ + public float getDamageModifier() { + return damageModifier; + } + + @Override + public ResourceLocation getIngredientLocation() { + return repairIngredient.location(); + } + + @Override + public TagKey getIngredientTag() { + return repairIngredient; + } + + @Override + public Item getIngredientAsItem() { + return BuiltInRegistries.ITEM.get(repairIngredient.location()); + } + + @Override + public int getLevel() { + return level; + } + + @Override + public int getEnchantmentValue() { + return enchantmentValue; + } + + @Override + public boolean isEnabled() { + return enabled; + } + + @Override + public @NotNull Ingredient getRepairIngredient() { + return Ingredient.of(repairIngredient); + } + + @Override + public ToolTier[] getValues() { + return values(); + } + +} diff --git a/common/src/main/java/cc/toph/progression/item/tier/passive/Passive.java b/common/src/main/java/cc/toph/progression/item/tier/passive/Passive.java new file mode 100644 index 0000000..16ec424 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tier/passive/Passive.java @@ -0,0 +1,4 @@ +package cc.toph.progression.item.tier.passive; + +public interface Passive { +} diff --git a/common/src/main/java/cc/toph/progression/item/tier/passive/Passives.java b/common/src/main/java/cc/toph/progression/item/tier/passive/Passives.java new file mode 100644 index 0000000..ba0507c --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tier/passive/Passives.java @@ -0,0 +1,19 @@ +package cc.toph.progression.item.tier.passive; + +public class Passives { + + public static class Echo implements Passive { + } + + public static class Refined implements Passive { + } + + public static class Shock implements Passive { + } + + public static class Void implements Passive { + } + + public static class Whiter implements Passive { + } +} diff --git a/common/src/main/java/cc/toph/progression/item/tier/ultimate/Ultimate.java b/common/src/main/java/cc/toph/progression/item/tier/ultimate/Ultimate.java new file mode 100644 index 0000000..1f3d1fc --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tier/ultimate/Ultimate.java @@ -0,0 +1,7 @@ +package cc.toph.progression.item.tier.ultimate; + +public interface Ultimate { + int getBaseCooldown(); + + void useUltimate(); +} diff --git a/common/src/main/java/cc/toph/progression/item/tier/ultimate/Ultimates.java b/common/src/main/java/cc/toph/progression/item/tier/ultimate/Ultimates.java new file mode 100644 index 0000000..5abc983 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tier/ultimate/Ultimates.java @@ -0,0 +1,62 @@ +package cc.toph.progression.item.tier.ultimate; + +public class Ultimates { + public class Echo implements Ultimate { + @Override + public int getBaseCooldown() { + return 0; + } + + @Override + public void useUltimate() { + } + } + + public class Refined implements Ultimate { + @Override + public int getBaseCooldown() { + return 0; + } + + @Override + public void useUltimate() { + + } + } + + public class Shock implements Ultimate { + @Override + public int getBaseCooldown() { + return 0; + } + + @Override + public void useUltimate() { + + } + } + + public class Void implements Ultimate { + @Override + public int getBaseCooldown() { + return 0; + } + + @Override + public void useUltimate() { + + } + } + + public class Whiter implements Ultimate { + @Override + public int getBaseCooldown() { + return 0; + } + + @Override + public void useUltimate() { + + } + } +} diff --git a/common/src/main/java/cc/toph/progression/item/tool/Axe.java b/common/src/main/java/cc/toph/progression/item/tool/Axe.java new file mode 100644 index 0000000..25b4d82 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tool/Axe.java @@ -0,0 +1,30 @@ +package cc.toph.progression.item.tool; + +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ToolTier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.AxeItem; +import org.jetbrains.annotations.NotNull; + +public class Axe extends AxeItem implements ItemSpec { + + // FIXME: damageModifier and speed are not the right values + public Axe(ToolTier tier, Properties properties) { + super(tier, tier.getDamageModifier(), tier.getSpeed(), properties); + } + + @Override + public @NotNull ToolTier getTier() { + return (ToolTier) super.getTier(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public Axe getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/tool/Hoe.java b/common/src/main/java/cc/toph/progression/item/tool/Hoe.java new file mode 100644 index 0000000..3148c6f --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tool/Hoe.java @@ -0,0 +1,30 @@ +package cc.toph.progression.item.tool; + +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ToolTier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.AxeItem; +import org.jetbrains.annotations.NotNull; + +public class Hoe extends AxeItem implements ItemSpec { + + // FIXME: damageModifier and speed are not the right values + public Hoe(ToolTier tier, Properties properties) { + super(tier, tier.getDamageModifier(), tier.getSpeed(), properties); + } + + @Override + public @NotNull ToolTier getTier() { + return (ToolTier) super.getTier(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public Hoe getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/tool/PickAxe.java b/common/src/main/java/cc/toph/progression/item/tool/PickAxe.java new file mode 100644 index 0000000..04f2faa --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tool/PickAxe.java @@ -0,0 +1,30 @@ +package cc.toph.progression.item.tool; + +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ToolTier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.AxeItem; +import org.jetbrains.annotations.NotNull; + +public class PickAxe extends AxeItem implements ItemSpec { + + // FIXME: damageModifier and speed are not the right values + public PickAxe(ToolTier tier, Properties properties) { + super(tier, tier.getDamageModifier(), tier.getSpeed(), properties); + } + + @Override + public @NotNull ToolTier getTier() { + return (ToolTier) super.getTier(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public PickAxe getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/tool/Shovel.java b/common/src/main/java/cc/toph/progression/item/tool/Shovel.java new file mode 100644 index 0000000..0f49e27 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/tool/Shovel.java @@ -0,0 +1,30 @@ +package cc.toph.progression.item.tool; + +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ToolTier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.AxeItem; +import org.jetbrains.annotations.NotNull; + +public class Shovel extends AxeItem implements ItemSpec { + + // FIXME: damageModifier and speed are not the right values + public Shovel(ToolTier tier, Properties properties) { + super(tier, tier.getDamageModifier(), tier.getSpeed(), properties); + } + + @Override + public @NotNull ToolTier getTier() { + return (ToolTier) super.getTier(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public Shovel getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/progression/item/weapon/Sword.java b/common/src/main/java/cc/toph/progression/item/weapon/Sword.java new file mode 100644 index 0000000..6db660b --- /dev/null +++ b/common/src/main/java/cc/toph/progression/item/weapon/Sword.java @@ -0,0 +1,29 @@ +package cc.toph.progression.item.weapon; + +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ToolTier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.SwordItem; +import org.jetbrains.annotations.NotNull; + +public class Sword extends SwordItem implements ItemSpec { + + public Sword(ToolTier tier, Properties properties) { + super(tier, (int) tier.getDamageModifier(), tier.getSpeed(), properties); + } + + @Override + public @NotNull ToolTier getTier() { + return (ToolTier) super.getTier(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public Sword getItemInstance() { + return this; + } +} diff --git a/common/src/main/java/cc/toph/simplycompat/item/SimplyCompatSwordItem.java b/common/src/main/java/cc/toph/progression/item/weapon/compat/SSSwordItem.java similarity index 51% rename from common/src/main/java/cc/toph/simplycompat/item/SimplyCompatSwordItem.java rename to common/src/main/java/cc/toph/progression/item/weapon/compat/SSSwordItem.java index ff4b490..328bf62 100644 --- a/common/src/main/java/cc/toph/simplycompat/item/SimplyCompatSwordItem.java +++ b/common/src/main/java/cc/toph/progression/item/weapon/compat/SSSwordItem.java @@ -1,8 +1,10 @@ -package cc.toph.simplycompat.item; +package cc.toph.progression.item.weapon.compat; -import cc.toph.simplycompat.util.ToolMaterials; -import cc.toph.simplycompat.util.WeaponType; +import cc.toph.progression.item.ItemSpec; +import cc.toph.progression.item.tier.ToolTier; +import net.minecraft.resources.ResourceLocation; import net.sweenus.simplyswords.item.SimplySwordsSwordItem; +import org.jetbrains.annotations.NotNull; /** * Extended Class from Simply Swords to store sword type. @@ -10,22 +12,20 @@ import net.sweenus.simplyswords.item.SimplySwordsSwordItem; * This class stores all the data we need from the sword, so we can just * retrieve the object from the registries cast it and do whatever we need. */ -public class SimplyCompatSwordItem & ToolMaterials> extends SimplySwordsSwordItem { +public class SSSwordItem extends SimplySwordsSwordItem implements ItemSpec { /** * The type of the weapon. */ - private final WeaponType TYPE; - private final ToolMaterials MATERIAL; + private final SSWeaponType TYPE; /** * Constructor for SimplyCompatSwordItem. * - * @param toolMaterial The material of the tool, which some of its properties/stats. + * @param toolMaterial The material of the tool, with some of its properties/stats. * @param type The type of the weapon, which affects its modifiers. - * @param The type of the enum that extends ToolMaterials. */ - public SimplyCompatSwordItem(ToolMaterials material, WeaponType type) { + public SSSwordItem(ToolTier material, SSWeaponType type) { super( material, (int) (material.getDamageModifier() + type.getPositiveModifier() - type.getNegativeModifier()), @@ -34,14 +34,24 @@ public class SimplyCompatSwordItem & ToolMaterials> extends ); this.TYPE = type; - this.MATERIAL = material; } - public ToolMaterials getMaterial() { - return MATERIAL; - } - - public WeaponType getType() { + public SSWeaponType getType() { return TYPE; } + + @Override + public @NotNull ToolTier getTier() { + return (ToolTier) super.getTier(); + } + + @Override + public ResourceLocation getLocation() { + return this.arch$registryName(); + } + + @Override + public SSSwordItem getItemInstance() { + return this; + } } \ No newline at end of file diff --git a/common/src/main/java/cc/toph/simplycompat/util/WeaponType.java b/common/src/main/java/cc/toph/progression/item/weapon/compat/SSWeaponType.java similarity index 99% rename from common/src/main/java/cc/toph/simplycompat/util/WeaponType.java rename to common/src/main/java/cc/toph/progression/item/weapon/compat/SSWeaponType.java index 4cdfc6f..55f56e8 100644 --- a/common/src/main/java/cc/toph/simplycompat/util/WeaponType.java +++ b/common/src/main/java/cc/toph/progression/item/weapon/compat/SSWeaponType.java @@ -1,8 +1,8 @@ -package cc.toph.simplycompat.util; +package cc.toph.progression.item.weapon.compat; import net.sweenus.simplyswords.config.ConfigDefaultValues; -public enum WeaponType { +public enum SSWeaponType { CHAKRAM( "chakram", net.sweenus.simplyswords.config.Config.getFloat( @@ -279,7 +279,7 @@ public enum WeaponType { final float negativeModifier; final float attackSpeed; - WeaponType( + SSWeaponType( String weaponNameSuffix, float positiveModifier, float negativeModifier, diff --git a/common/src/main/java/cc/toph/progression/registry/CompatRegistry.java b/common/src/main/java/cc/toph/progression/registry/CompatRegistry.java new file mode 100644 index 0000000..147df44 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/registry/CompatRegistry.java @@ -0,0 +1,73 @@ +package cc.toph.progression.registry; + +import cc.toph.progression.util.CompatRecord; +import net.sweenus.simplyswords.SimplySwords; + +/** + * A registry for compatibility records. Each record represents + * a supported mod's integration setup. + * + *

Use {@link #registerCompats()} to initialize all integrations.

+ */ + +public final class CompatRegistry { + +// /** +// * Compatibility setup for the Create mod. +// */ +// public static final CompatRecord ADDITIONAL_ADDITIONS = new CompatRecord<>( +// AdditionalAdditions.namespace, +// "6.0.1", +// AdditionalAdditionsToolMaterials.class +// ); +// +// /** +// * Compatibility setup for the Create mod. +// */ +// public static final CompatRecord CREATE = new CompatRecord<>( +// Create.ID, +// "0.5.1.j-55", +// CreateToolMaterials.class +// ); +// +// /** +// * Compatibility setup for the Create Deep Dark mod. +// */ +// public static final CompatRecord CREATE_DEEP_DARK = new CompatRecord<>( +// CreateDeepDarkMod.MODID, +// "1.7.0", +// CreateDeepDarkToolMaterials.class +// ); +// +// /** +// * Compatibility setup for the Create Deep Dark mod. +// */ +// public static final CompatRecord PURE_COPPER = new CompatRecord<>( +// PurecoppertoolsMod.MODID, +// "1.0.1", +// PureCopperToolMaterials.class +// ); +// +// /** +// * Compatibility setup for the TFMG mod. +// */ +// public static final CompatRecord TFMG = new CompatRecord<>( +// CreateTFMG.MOD_ID, +// "0.9.3-1.20.1", +// TFMGToolMaterials.class +// ); +// + + public static final CompatRecord SIMPLY_SWORDS = new CompatRecord( + SimplySwords.MOD_ID, + "1.56.0-1.20.1" + ); + + /** + * Initializes all declared compat records. + */ + public static void registerCompats() { + SIMPLY_SWORDS.register(); + } +} + diff --git a/common/src/main/java/cc/toph/progression/registry/ConfigRegistry.java b/common/src/main/java/cc/toph/progression/registry/ConfigRegistry.java new file mode 100644 index 0000000..7c5c3ab --- /dev/null +++ b/common/src/main/java/cc/toph/progression/registry/ConfigRegistry.java @@ -0,0 +1,188 @@ +package cc.toph.progression.registry; + +import cc.toph.progression.config.Config; +import cc.toph.progression.config.ConfigProvider; + +public final class ConfigRegistry { + public static final class TIER_ATTRIBUTES { + + public static float COPPER; + public static boolean COPPER_ENABLED; + public static float EXPOSED_COPPER; + public static boolean EXPOSED_COPPER_ENABLED; + public static float WEATHERED_COPPER; + public static boolean WEATHERED_COPPER_ENABLED; + public static float OXIDIZED_COPPER; + public static boolean OXIDIZED_COPPER_ENABLED; + + public static float ROSE_GOLD; + public static boolean ROSE_GOLD_ENABLED; + + public static float STEEL; + public static boolean STEEL_ENABLED; + + public static float STURDY; + public static boolean STURDY_ENABLED; + + public static float ECHO; + public static boolean ECHO_ENABLED; + + public static float REFINED; + public static boolean REFINED_ENABLED; + + public static float SHOCK; + public static boolean SHOCK_ENABLED; + + public static float VOID; + public static boolean VOID_ENABLED; + + public static float WHITHER; + public static boolean WHITHER_ENABLED; + + + public static final ConfigProvider PROVIDER = new ConfigProvider("tier_attributes"); + + public static void register() { + Config config = new Config(PROVIDER); + + COPPER = config.registerProp( + "copper_damage_modifier", + 3.0f, + "Copper Damage Modifier" + ); + COPPER_ENABLED = config.registerProp( + "copper_enabled", + true, + "Enable Copper Tier" + ); + + EXPOSED_COPPER = config.registerProp( + "exposed_copper_damage_modifier", + 3.0f, + "Exposed Copper Damage Modifier" + ); + EXPOSED_COPPER_ENABLED = config.registerProp( + "exposed_copper_enabled", + true, + "Enable Exposed Copper Tier" + ); + + WEATHERED_COPPER = config.registerProp( + "weathered_copper_damage_modifier", + 3.0f, + "Weathered Copper Damage Modifier" + ); + WEATHERED_COPPER_ENABLED = config.registerProp( + "weathered_copper_enabled", + true, + "Enable Weathered Copper Tier" + ); + + OXIDIZED_COPPER = config.registerProp( + "oxidized_copper_damage_modifier", + 3.5f, + "Oxidized Copper Damage Modifier" + ); + OXIDIZED_COPPER_ENABLED = config.registerProp( + "oxidized_copper_enabled", + true, + "Enable Oxidized Copper Tier" + ); + + ROSE_GOLD = config.registerProp( + "rose_gold_damage_modifier", + 3.0f, + "Rose Gold Damage Modifier" + ); + ROSE_GOLD_ENABLED = config.registerProp( + "rose_gold_enabled", + true, + "Enable Rose Gold Tier" + ); + + STEEL = config.registerProp( + "steel_damage_modifier", + 3.5f, + "Steel Damage Modifier" + ); + STEEL_ENABLED = config.registerProp( + "steel_enabled", + true, + "Enable Steel Tier" + ); + + STURDY = config.registerProp( + "sturdy_damage_modifier", + 3.5f, + "Sturdy Damage Modifier" + ); + STURDY_ENABLED = config.registerProp( + "sturdy_enabled", + true, + "Enable Sturdy Tier" + ); + + ECHO = config.registerProp( + "echo_damage_modifier", + 5.0f, + "Echo Damage Modifier" + ); + ECHO_ENABLED = config.registerProp( + "echo_enabled", + true, + "Enable Echo Tier" + ); + + REFINED = config.registerProp( + "refined_damage_modifier", + 4.5f, + "Refined Damage Modifier" + ); + REFINED_ENABLED = config.registerProp( + "refined_enabled", + true, + "Enable Refined Tier" + ); + + SHOCK = config.registerProp( + "shock_damage_modifier", + 4.5f, + "Shock Damage Modifier" + ); + SHOCK_ENABLED = config.registerProp( + "shock_enabled", + true, + "Enable Shock Tier" + ); + + VOID = config.registerProp( + "void_damage_modifier", + 4.5f, + "Void Damage Modifier" + ); + VOID_ENABLED = config.registerProp( + "void_enabled", + true, + "Enable Void Tier" + ); + + WHITHER = config.registerProp( + "whither_damage_modifier", + 4.5f, + "Whither Damage Modifier" + ); + WHITHER_ENABLED = config.registerProp( + "whither_enabled", + true, + "Enable Whither Tier" + ); + + config.register(); + } + + } + + public static void registerConfigs() { + TIER_ATTRIBUTES.register(); + } +} diff --git a/common/src/main/java/cc/toph/progression/registry/ItemsRegistry.java b/common/src/main/java/cc/toph/progression/registry/ItemsRegistry.java new file mode 100644 index 0000000..2bbe77e --- /dev/null +++ b/common/src/main/java/cc/toph/progression/registry/ItemsRegistry.java @@ -0,0 +1,266 @@ +package cc.toph.progression.registry; + +import cc.toph.progression.item.armor.Armor; +import cc.toph.progression.item.armor.UltimateArmor; +import cc.toph.progression.item.ingot.Ingot; +import cc.toph.progression.item.ingot.Spawnable; +import cc.toph.progression.item.tier.ArmorTier; +import cc.toph.progression.item.tier.ToolTier; +import cc.toph.progression.item.tool.Axe; +import cc.toph.progression.item.tool.Hoe; +import cc.toph.progression.item.tool.PickAxe; +import cc.toph.progression.item.tool.Shovel; +import cc.toph.progression.item.weapon.Sword; +import cc.toph.progression.item.weapon.compat.SSSwordItem; +import cc.toph.progression.item.weapon.compat.SSWeaponType; +import dev.architectury.registry.registries.DeferredRegister; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.SwordItem; +import net.sweenus.simplyswords.item.SimplySwordsSwordItem; + +import java.util.ArrayList; +import java.util.List; + +import static cc.toph.progression.util.Constants.MOD_ID; + +public final class ItemsRegistry { + public static void registerItems() { + Ingots.register(); + Armors.register(); + Tools.register(); + Swords.register(); + // SimplySwords.register(); + + // CompatRegistry.registerCompats(); + } + + public static final class Ingots { + public static final DeferredRegister REGISTRY = DeferredRegister.create(MOD_ID, Registries.ITEM); + + /* + Register ingots for each tool tier, + although tiers are technically not ingots + they have the same names so ¯\_(ツ)_/¯ + */ + private static void registerIngots() { + for (ToolTier tier : ToolTier.values()) { + if (tier.isEnabled()) { + switch (tier.getName()) { + case "REFINED": + case "ECHO": + case "WHITHER": + case "VOID": + REGISTRY.register(tier.getName() + "_ingot", () -> new Spawnable(new Item.Properties().arch$tab(TabRegistry.PROGRESSION))); + default: + REGISTRY.register(tier.getName() + "_ingot", () -> new Ingot(new Item.Properties().arch$tab(TabRegistry.PROGRESSION))); + } + } + } + } + + public static List getIngots() { + var ingots = new ArrayList(); + REGISTRY.forEach((item) -> { + if (item.get() instanceof Ingot) { + ingots.add((Ingot) item.get()); + } + }); + + return ingots; + } + + //TODO: haven't created them yet + private static void registerCompounds() { + // + } + + private static void register() { + registerIngots(); + // registerCompounds(); + REGISTRY.register(); + } + + } + + public static final class Armors { + public static final DeferredRegister REGISTRY = DeferredRegister.create(MOD_ID, Registries.ITEM); + + public static List getArmors() { + var armors = new ArrayList(); + REGISTRY.forEach((item) -> { + if (item.get() instanceof Armor) { + armors.add((Armor) item.get()); + } + }); + + return armors; + } + + private static void registerArmors() { + for (ArmorTier tier : ArmorTier.values()) { + for (ArmorItem.Type type : ArmorItem.Type.values()) { + if (tier.isEnabled()) { + switch (tier.getName()) { + case "REFINED": + case "ECHO": + case "WHITHER": + case "VOID": + REGISTRY.register( + tier.getName() + "_" + type.getName(), + () -> new UltimateArmor(tier, type, new Item.Properties().arch$tab(TabRegistry.PROGRESSION), null) + ); + default: + REGISTRY.register( + tier.getName() + "_" + type.getName(), + () -> new Armor(tier, type, new Item.Properties().arch$tab(TabRegistry.PROGRESSION)) + ); + } + } + } + } + } + + private static void register() { + registerArmors(); + REGISTRY.register(); + } + } + + public static final class Tools { + public static final DeferredRegister AXE = DeferredRegister.create(MOD_ID, Registries.ITEM); + public static final DeferredRegister PICKAXE = DeferredRegister.create(MOD_ID, Registries.ITEM); + public static final DeferredRegister SHOVEL = DeferredRegister.create(MOD_ID, Registries.ITEM); + public static final DeferredRegister HOE = DeferredRegister.create(MOD_ID, Registries.ITEM); + + private static void registerTools() { + for (ToolTier tier : ToolTier.values()) { + if (tier.isEnabled()) { + AXE.register(tier.getName() + "_axe", () -> new Axe(tier, new Item.Properties().arch$tab(TabRegistry.PROGRESSION))); + PICKAXE.register(tier.getName() + "_pickaxe", () -> new PickAxe(tier, new Item.Properties().arch$tab(TabRegistry.PROGRESSION))); + SHOVEL.register(tier.getName() + "_shovel", () -> new Shovel(tier, new Item.Properties().arch$tab(TabRegistry.PROGRESSION))); + HOE.register(tier.getName() + "_hoe", () -> new Hoe(tier, new Item.Properties().arch$tab(TabRegistry.PROGRESSION))); + } + } + } + + public static List getAxes() { + var axes = new ArrayList(); + AXE.forEach((item) -> { + if (item.get() instanceof Axe) { + axes.add((Axe) item.get()); + } + }); + return axes; + } + + public static List getPickAxes() { + var pickAxes = new ArrayList(); + PICKAXE.forEach((item) -> { + if (item.get() instanceof PickAxe) { + pickAxes.add((PickAxe) item.get()); + } + }); + return pickAxes; + } + + public static List getShovels() { + var shovels = new ArrayList(); + SHOVEL.forEach((item) -> { + if (item.get() instanceof Shovel) { + shovels.add((Shovel) item.get()); + } + }); + return shovels; + } + + public static List getHoes() { + var hoes = new ArrayList(); + HOE.forEach((item) -> { + if (item.get() instanceof Hoe) { + hoes.add((Hoe) item.get()); + } + }); + return hoes; + } + + private static void register() { + registerTools(); + AXE.register(); + PICKAXE.register(); + SHOVEL.register(); + HOE.register(); + } + } + + public static final class Swords { + public static final DeferredRegister REGISTRY = DeferredRegister.create(MOD_ID, Registries.ITEM); + + private static void registerSwords() { + for (ToolTier tier : ToolTier.values()) { + if (tier.isEnabled()) { + REGISTRY.register(tier.getName() + "_sword" + , () -> new Sword(tier, new Item.Properties().arch$tab(TabRegistry.PROGRESSION)) + ); + } + } + } + + public static List getSwords() { + var swords = new ArrayList(); + REGISTRY.forEach((item) -> { + if (item.get() instanceof Sword) { + swords.add((Sword) item.get()); + } + }); + + return swords; + } + + private static void register() { + registerSwords(); + REGISTRY.register(); + } + } + + public static final class SimplySwords { + public static final DeferredRegister REGISTRY = DeferredRegister.create(MOD_ID, Registries.ITEM); + + // FIXME: pasted old code, needs to be updated probably + private static void registerSSwords() { + for (SSWeaponType type : SSWeaponType.values()) { + for (ToolTier material : ToolTier.values()) { + if (material.isEnabled()) { + var name = material.getName() + "_" + type.getWeaponNameSuffix(); + REGISTRY.register(name, () -> new SSSwordItem(material, type)); + } + } + } + } + + public static List getSwords() { + var swords = new ArrayList(); + REGISTRY.forEach((item) -> { + if (item.get() instanceof SwordItem) { + swords.add((SimplySwordsSwordItem) item.get()); + } + }); + + return swords; + } + + private static void register() { + + //TODO: if SS enabled register SS swords + // for (ToolTier tier : ToolTier.values()) { + // if (tier.isEnabled()) { + // REGISTRY.register(tier.getName() + "_sword", () -> new Weapon(new Item.Properties())); + // } + // } + + registerSSwords(); + REGISTRY.register(); + } + } +} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/progression/registry/TabRegistry.java b/common/src/main/java/cc/toph/progression/registry/TabRegistry.java new file mode 100644 index 0000000..b1ad1d6 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/registry/TabRegistry.java @@ -0,0 +1,31 @@ +package cc.toph.progression.registry; + +import cc.toph.progression.util.Helpers; +import dev.architectury.registry.registries.DeferredRegister; +import dev.architectury.registry.registries.RegistrySupplier; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +import static cc.toph.progression.util.Constants.MOD_ID; + +public class TabRegistry { + + private static final DeferredRegister REGISTRY = DeferredRegister.create( + MOD_ID, + Registries.CREATIVE_MODE_TAB + ); + + public static final RegistrySupplier PROGRESSION = REGISTRY.register( + MOD_ID, + Helpers.supplyCreativeTab(String.format( + "creativeTab.%s.%s", MOD_ID, MOD_ID), + new ItemStack(Items.STICK) + ) + ); + + public static void registerTabs() { + REGISTRY.register(); + } +} diff --git a/common/src/main/java/cc/toph/progression/tag/TagSpec.java b/common/src/main/java/cc/toph/progression/tag/TagSpec.java new file mode 100644 index 0000000..66340fb --- /dev/null +++ b/common/src/main/java/cc/toph/progression/tag/TagSpec.java @@ -0,0 +1,13 @@ +package cc.toph.progression.tag; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; + +public interface TagSpec { + + ResourceLocation getLocation(); + + TagKey tag(); + + String getName(); +} diff --git a/common/src/main/java/cc/toph/progression/tag/Tags.java b/common/src/main/java/cc/toph/progression/tag/Tags.java new file mode 100644 index 0000000..52880d2 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/tag/Tags.java @@ -0,0 +1,46 @@ +package cc.toph.progression.tag; + +import cc.toph.progression.util.Helpers; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; + +public class Tags { + + public enum ITEMS implements TagSpec { + COPPER_INGOT("copper_ingot"), + EXPOSED_COPPER_INGOT("exposed_copper_ingot"), + WEATHERED_COPPER_INGOT("weathered_copper_ingot"), + OXIDIZED_COPPER_INGOT("oxidized_copper_ingot"), + ROSE_GOLD_INGOT("rose_gold_ingot"), + STURDY_INGOT("sturdy_ingot"), + STEEL_INGOT("steel_ingot"), + REFINED_INGOT("refined_ingot"), + ECHO_INGOT("echo_ingot"), + WHITHER_INGOT("whither_ingot"), + VOID_INGOT("void_ingot"), + SHOCK_INGOT("shock_ingot"); + + private final TagKey tag; + + ITEMS(String name) { + this.tag = TagKey.create(Registries.ITEM, Helpers.buildLocation(name)); + } + + @Override + public ResourceLocation getLocation() { + return tag.location(); + } + + @Override + public TagKey tag() { + return tag; + } + + @Override + public String getName() { + return this.name().toLowerCase(); + } + } +} diff --git a/common/src/main/java/cc/toph/progression/util/CompatRecord.java b/common/src/main/java/cc/toph/progression/util/CompatRecord.java new file mode 100644 index 0000000..e99efd7 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/util/CompatRecord.java @@ -0,0 +1,39 @@ +package cc.toph.progression.util; + +import dev.architectury.platform.Platform; + +/** + * The CompatRecord class represents a compatibility record used for managing + * mod integrations and extending functionality based on certain requirements. + * This record checks whether a specific mod is present, its version is compatible, + * and registers tool materials and weapon types if the conditions are met. + * + * @param modId The unique identifier for the mod to be checked. + * @param requiredVersion The minimum version of the mod that is required for compatibility. + */ +public record CompatRecord( + String modId, + String requiredVersion +) { + + /** + * Checks whether the mod's version is loaded + * and passes the required version check. + */ + public boolean passCheck() { + if (Platform.isModLoaded(modId)) { + return Platform.getMod(modId) + .getVersion() + .compareTo(requiredVersion) >= 0; + } + return false; + } + + // TODO: Should register mod items ideally + public void register() { + if (!passCheck()) { + Constants.LOGGER.info("Mod " + modId + " is not loaded or is not the correct version."); + } + Constants.LOGGER.info("Registering compat record " + modId); + } +} diff --git a/common/src/main/java/cc/toph/progression/util/Constants.java b/common/src/main/java/cc/toph/progression/util/Constants.java new file mode 100644 index 0000000..ecfdf11 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/util/Constants.java @@ -0,0 +1,9 @@ +package cc.toph.progression.util; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class Constants { + public static final String MOD_ID = "progression"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); +} diff --git a/common/src/main/java/cc/toph/progression/util/Helpers.java b/common/src/main/java/cc/toph/progression/util/Helpers.java new file mode 100644 index 0000000..a7b5a69 --- /dev/null +++ b/common/src/main/java/cc/toph/progression/util/Helpers.java @@ -0,0 +1,24 @@ +package cc.toph.progression.util; + +import dev.architectury.registry.CreativeTabRegistry; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; + +import java.util.function.Supplier; + +public class Helpers { + + public static Supplier supplyCreativeTab(String translateKey, ItemStack Icon) { + return () -> CreativeTabRegistry.create( + // TODO: I think this works like string format but verify later + Component.translatable(translateKey), + () -> Icon + ); + } + + public static ResourceLocation buildLocation(String path) { + return new ResourceLocation(Constants.MOD_ID, path); + } +} diff --git a/common/src/main/java/cc/toph/simplycompat/SimplyCompat.java b/common/src/main/java/cc/toph/simplycompat/SimplyCompat.java deleted file mode 100644 index e25ec35..0000000 --- a/common/src/main/java/cc/toph/simplycompat/SimplyCompat.java +++ /dev/null @@ -1,36 +0,0 @@ -package cc.toph.simplycompat; - -import cc.toph.simplycompat.registry.ConfigRegistry; -import cc.toph.simplycompat.registry.ItemsRegistry; -import net.minecraft.resources.ResourceLocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public final class SimplyCompat { - - public static final String MOD_ID = "simplycompat"; - - // Unused TAB, for now added so SS's Tab registry by SSSwordItem class - // public static final DeferredRegister TABS = DeferredRegister.create( - // MOD_ID, - // Registries.CREATIVE_MODE_TAB - // ); - // public static final RegistrySupplier SIMPLYCOMPAT = TABS.register(MOD_ID, () -> - // CreativeTabRegistry.create( - // Component.translatable("creativeTab.simplycompat.simplycompat"), - // () -> new ItemStack(Items.AMETHYST_SHARD) - // ) - // ); - - public static final Logger LOGGER = LogManager.getLogger(MOD_ID); - - public static void init() { - // TABS.register(); - ConfigRegistry.registerConfigs(); - ItemsRegistry.registerSwords(); - } - - public static ResourceLocation location(String path) { - return new ResourceLocation(MOD_ID, path); - } -} diff --git a/common/src/main/java/cc/toph/simplycompat/compat/AdditionalAdditionsToolMaterials.java b/common/src/main/java/cc/toph/simplycompat/compat/AdditionalAdditionsToolMaterials.java deleted file mode 100644 index 11a51de..0000000 --- a/common/src/main/java/cc/toph/simplycompat/compat/AdditionalAdditionsToolMaterials.java +++ /dev/null @@ -1,132 +0,0 @@ -package cc.toph.simplycompat.compat; - -import cc.toph.simplycompat.registry.ConfigRegistry; -import cc.toph.simplycompat.util.ToolMaterials; -import dqu.additionaladditions.AdditionalAdditions; -import dqu.additionaladditions.material.GildedNetheriteToolMaterial; -import dqu.additionaladditions.material.RoseGoldToolMaterial; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public enum AdditionalAdditionsToolMaterials implements ToolMaterials { - /** - * See {@link RoseGoldToolMaterial} - */ - ROSE_GOLD( - 2, - 900, - 9.0f, - 2.0F, - ConfigRegistry.WEAPON_ATTRIBUTES.ROSE_GOLD, - 17, - ConfigRegistry.WEAPON_ATTRIBUTES.ROSE_GOLD_ENABLED, - new ResourceLocation(AdditionalAdditions.namespace, "rose_gold_alloy") - ), - /** - * See {@link GildedNetheriteToolMaterial} - */ - GILDED_NETHERITE( - 4, - 2031, - 10.0F, - 4.5F, - ConfigRegistry.WEAPON_ATTRIBUTES.ROSE_GOLD, - 20, - ConfigRegistry.WEAPON_ATTRIBUTES.ROSE_GOLD_ENABLED, - Items.NETHERITE_INGOT.arch$registryName() - ); - - private final int level; - private final int uses; - private final float speed; - private final float attackDamageBonus; - private final float damageModifier; - private final int enchantmentValue; - private final boolean enabled; - private final ResourceLocation repairIngredient; - - AdditionalAdditionsToolMaterials( - int level, - int uses, - float speed, - float attackDamageBonus, - float damageModifier, - int enchantmentValue, - boolean enabled, - ResourceLocation repairIngredient - ) { - this.level = level; - this.uses = uses; - this.speed = speed; - this.attackDamageBonus = attackDamageBonus; - this.enchantmentValue = enchantmentValue; - this.damageModifier = damageModifier; - this.enabled = enabled; - this.repairIngredient = repairIngredient; - } - - @Override - public String getName() { - return this.name().toLowerCase(); - } - - @Override - public String getIdentifier() { - return repairIngredient.toString(); - } - - @Override - public int getUses() { - return uses; - } - - @Override - public float getSpeed() { - return speed; - } - - @Override - public float getAttackDamageBonus() { - return attackDamageBonus; - } - - @Override - public float getDamageModifier() { - return damageModifier; - } - - @Override - public ResourceLocation getIngredientLocation() { - return repairIngredient; - } - - @Override - public int getLevel() { - return level; - } - - @Override - public int getEnchantmentValue() { - return enchantmentValue; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(BuiltInRegistries.ITEM.get(repairIngredient)); - } - - @Override - public AdditionalAdditionsToolMaterials[] getValues() { - return values(); - } - - -} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/simplycompat/compat/CreateDeepDarkToolMaterials.java b/common/src/main/java/cc/toph/simplycompat/compat/CreateDeepDarkToolMaterials.java deleted file mode 100644 index 0e9a3b7..0000000 --- a/common/src/main/java/cc/toph/simplycompat/compat/CreateDeepDarkToolMaterials.java +++ /dev/null @@ -1,116 +0,0 @@ -package cc.toph.simplycompat.compat; - -import cc.toph.simplycompat.registry.ConfigRegistry; -import cc.toph.simplycompat.util.ToolMaterials; -import create_deep_dark.CreateDeepDarkMod; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public enum CreateDeepDarkToolMaterials implements ToolMaterials { - /** - * See {@link create_deep_dark.item.EchoSwordItem} - */ - ECHO( - 4, - 2124, - 10.0f, - 6.0f, - ConfigRegistry.WEAPON_ATTRIBUTES.ECHO, - 18, - ConfigRegistry.WEAPON_ATTRIBUTES.ECHO_ENABLED, - new ResourceLocation(CreateDeepDarkMod.MODID, "echo_ingot") - ); - - private final int level; - private final int uses; - private final float speed; - private final float attackDamageBonus; - private final float damageModifier; - private final int enchantmentValue; - private final boolean enabled; - private final ResourceLocation repairIngredient; - - CreateDeepDarkToolMaterials( - int level, - int uses, - float speed, - float attackDamageBonus, - float damageModifier, - int enchantmentValue, - boolean enabled, - ResourceLocation repairIngredient - ) { - this.level = level; - this.uses = uses; - this.speed = speed; - this.attackDamageBonus = attackDamageBonus; - this.enchantmentValue = enchantmentValue; - this.damageModifier = damageModifier; - this.enabled = enabled; - this.repairIngredient = repairIngredient; - } - - @Override - public String getName() { - return this.name().toLowerCase(); - } - - @Override - public String getIdentifier() { - return repairIngredient.toString(); - } - - @Override - public int getUses() { - return uses; - } - - @Override - public float getSpeed() { - return speed; - } - - @Override - public float getAttackDamageBonus() { - return attackDamageBonus; - } - - @Override - public float getDamageModifier() { - return damageModifier; - } - - @Override - public ResourceLocation getIngredientLocation() { - return repairIngredient; - } - - @Override - public int getLevel() { - return level; - } - - @Override - public int getEnchantmentValue() { - return enchantmentValue; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(BuiltInRegistries.ITEM.get(repairIngredient)); - } - - @Override - public CreateDeepDarkToolMaterials[] getValues() { - return values(); - } - - -} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/simplycompat/compat/CreateToolMaterials.java b/common/src/main/java/cc/toph/simplycompat/compat/CreateToolMaterials.java deleted file mode 100644 index 668e0a3..0000000 --- a/common/src/main/java/cc/toph/simplycompat/compat/CreateToolMaterials.java +++ /dev/null @@ -1,114 +0,0 @@ -package cc.toph.simplycompat.compat; - -import cc.toph.simplycompat.registry.ConfigRegistry; -import cc.toph.simplycompat.util.ToolMaterials; -import com.simibubi.create.AllItems; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public enum CreateToolMaterials implements ToolMaterials { - STURDY( - 3, - 1800, - 8.0f, - 3.5f, - ConfigRegistry.WEAPON_ATTRIBUTES.STURDY, - 14, - ConfigRegistry.WEAPON_ATTRIBUTES.STURDY_ENABLED, - AllItems.STURDY_SHEET.getId() - - ); - - private final int level; - private final int uses; - private final float speed; - private final float attackDamageBonus; - private final float damageModifier; - private final int enchantmentValue; - private final boolean enabled; - private final ResourceLocation repairIngredient; - - CreateToolMaterials( - int level, - int uses, - float speed, - float attackDamageBonus, - float damageModifier, - int enchantmentValue, - boolean enabled, - ResourceLocation repairIngredient - ) { - this.level = level; - this.uses = uses; - this.speed = speed; - this.attackDamageBonus = attackDamageBonus; - this.enchantmentValue = enchantmentValue; - this.damageModifier = damageModifier; - this.enabled = enabled; - this.repairIngredient = repairIngredient; - } - - @Override - public String getName() { - return this.name().toLowerCase(); - } - - @Override - public String getIdentifier() { - return repairIngredient.toString(); - } - - @Override - public int getUses() { - return uses; - } - - @Override - public float getSpeed() { - return speed; - } - - @Override - public float getAttackDamageBonus() { - return attackDamageBonus; - } - - @Override - public float getDamageModifier() { - return damageModifier; - } - - @Override - public ResourceLocation getIngredientLocation() { - return repairIngredient; - } - - @Override - public int getLevel() { - return level; - } - - @Override - public int getEnchantmentValue() { - return enchantmentValue; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(BuiltInRegistries.ITEM.get(repairIngredient)); - } - - @Override - public CreateToolMaterials[] getValues() { - return values(); - } - - -} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/simplycompat/compat/PureCopperToolMaterials.java b/common/src/main/java/cc/toph/simplycompat/compat/PureCopperToolMaterials.java deleted file mode 100644 index a1f8d92..0000000 --- a/common/src/main/java/cc/toph/simplycompat/compat/PureCopperToolMaterials.java +++ /dev/null @@ -1,147 +0,0 @@ -package cc.toph.simplycompat.compat; - -import cc.toph.simplycompat.registry.ConfigRegistry; -import cc.toph.simplycompat.util.ToolMaterials; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; -import net.purejosh.purecoppertools.PurecoppertoolsMod; -import org.jetbrains.annotations.NotNull; - -public enum PureCopperToolMaterials implements ToolMaterials { - COPPER( - 0, - 184, - 3.0F, - 1.5f, - ConfigRegistry.WEAPON_ATTRIBUTES.COPPER, - 22, - ConfigRegistry.WEAPON_ATTRIBUTES.COPPER_ENABLED, - Items.COPPER_INGOT.arch$registryName() - - ), - EXPOSED_COPPER( - 0, - 218, - 3.0f, - 2.0f, - ConfigRegistry.WEAPON_ATTRIBUTES.EXPOSED_COPPER, - 18, - ConfigRegistry.WEAPON_ATTRIBUTES.EXPOSED_COPPER_ENABLED, - new ResourceLocation(PurecoppertoolsMod.MODID, "exposed_copper_ingot") - - ), - WEATHERED_COPPER( - 0, - 258, - 3.5f, - 2.5f, - ConfigRegistry.WEAPON_ATTRIBUTES.WEATHERED_COPPER, - 14, - ConfigRegistry.WEAPON_ATTRIBUTES.WEATHERED_COPPER_ENABLED, - new ResourceLocation(PurecoppertoolsMod.MODID, "weathered_copper_ingot") - - ), - OXIDIZED_COPPER( - 0, - 304, - 4.0f, - 3.0f, - ConfigRegistry.WEAPON_ATTRIBUTES.OXIDIZED_COPPER, - 10, - ConfigRegistry.WEAPON_ATTRIBUTES.OXIDIZED_COPPER_ENABLED, - new ResourceLocation(PurecoppertoolsMod.MODID, "oxidized_copper_ingot") - ); - - private final int level; - private final int uses; - private final float speed; - private final float attackDamageBonus; - private final float damageModifier; - private final int enchantmentValue; - private final boolean enabled; - private final ResourceLocation repairIngredient; - - PureCopperToolMaterials( - int level, - int uses, - float speed, - float attackDamageBonus, - float damageModifier, - int enchantmentValue, - boolean enabled, - ResourceLocation repairIngredient - ) { - this.level = level; - this.uses = uses; - this.speed = speed; - this.attackDamageBonus = attackDamageBonus; - this.enchantmentValue = enchantmentValue; - this.damageModifier = damageModifier; - this.enabled = enabled; - this.repairIngredient = repairIngredient; - } - - @Override - public String getName() { - return this.name().toLowerCase(); - } - - @Override - public String getIdentifier() { - return repairIngredient.toString(); - } - - @Override - public int getUses() { - return uses; - } - - @Override - public float getSpeed() { - return speed; - } - - @Override - public float getAttackDamageBonus() { - return attackDamageBonus; - } - - @Override - public float getDamageModifier() { - return damageModifier; - } - - @Override - public ResourceLocation getIngredientLocation() { - return repairIngredient; - } - - @Override - public int getLevel() { - return level; - } - - @Override - public int getEnchantmentValue() { - return enchantmentValue; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(BuiltInRegistries.ITEM.get(repairIngredient)); - } - - @Override - public PureCopperToolMaterials[] getValues() { - return values(); - } - - -} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/simplycompat/compat/TFMGToolMaterials.java b/common/src/main/java/cc/toph/simplycompat/compat/TFMGToolMaterials.java deleted file mode 100644 index ca69ece..0000000 --- a/common/src/main/java/cc/toph/simplycompat/compat/TFMGToolMaterials.java +++ /dev/null @@ -1,135 +0,0 @@ -package cc.toph.simplycompat.compat; - -import cc.toph.simplycompat.registry.ConfigRegistry; -import cc.toph.simplycompat.util.ToolMaterials; -import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGTiers; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public enum TFMGToolMaterials implements ToolMaterials { - ALUMINUM( - TFMGTiers.ALUMINUM.getLevel(), - TFMGTiers.ALUMINUM.getUses(), - TFMGTiers.ALUMINUM.getSpeed(), - TFMGTiers.ALUMINUM.getAttackDamageBonus(), - ConfigRegistry.WEAPON_ATTRIBUTES.ALUMINUM, - TFMGTiers.ALUMINUM.getEnchantmentValue(), - ConfigRegistry.WEAPON_ATTRIBUTES.ALUMINUM_ENABLED, - TFMGItems.ALUMINUM_INGOT.getId() - ), - LEAD( - TFMGTiers.LEAD.getLevel(), - TFMGTiers.LEAD.getUses(), - TFMGTiers.LEAD.getSpeed(), - TFMGTiers.LEAD.getAttackDamageBonus(), - ConfigRegistry.WEAPON_ATTRIBUTES.LEAD, - TFMGTiers.LEAD.getEnchantmentValue(), - ConfigRegistry.WEAPON_ATTRIBUTES.LEAD_ENABLED, - TFMGItems.LEAD_INGOT.getId() - ), - STEEL( - TFMGTiers.STEEL.getLevel(), - TFMGTiers.STEEL.getUses(), - TFMGTiers.STEEL.getSpeed(), - TFMGTiers.STEEL.getAttackDamageBonus(), - ConfigRegistry.WEAPON_ATTRIBUTES.STEEL, - TFMGTiers.STEEL.getEnchantmentValue(), - ConfigRegistry.WEAPON_ATTRIBUTES.STEEL_ENABLED, - TFMGItems.STEEL_INGOT.getId() - ); - - private final int level; - private final int uses; - private final float speed; - private final float attackDamageBonus; - private final float damageModifier; - private final int enchantmentValue; - private final boolean enabled; - private final ResourceLocation repairIngredient; - - TFMGToolMaterials( - int level, - int uses, - float speed, - float attackDamageBonus, - float damageModifier, - int enchantmentValue, - boolean enabled, - ResourceLocation repairIngredient - ) { - this.level = level; - this.uses = uses; - this.speed = speed; - this.attackDamageBonus = attackDamageBonus; - this.enchantmentValue = enchantmentValue; - this.damageModifier = damageModifier; - this.enabled = enabled; - this.repairIngredient = repairIngredient; - - - } - - @Override - public String getName() { - return this.name().toLowerCase(); - } - - @Override - public String getIdentifier() { - return repairIngredient.toString(); - } - - @Override - public int getUses() { - return uses; - } - - @Override - public float getSpeed() { - return speed; - } - - @Override - public float getAttackDamageBonus() { - return attackDamageBonus; - } - - @Override - public float getDamageModifier() { - return damageModifier; - } - - @Override - public ResourceLocation getIngredientLocation() { - return repairIngredient; - } - - @Override - public int getLevel() { - return level; - } - - @Override - public int getEnchantmentValue() { - return enchantmentValue; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(BuiltInRegistries.ITEM.get(repairIngredient)); - } - - @Override - public TFMGToolMaterials[] getValues() { - return values(); - } - -} \ No newline at end of file diff --git a/common/src/main/java/cc/toph/simplycompat/item/SimplyCompatToolMaterials.java b/common/src/main/java/cc/toph/simplycompat/item/SimplyCompatToolMaterials.java deleted file mode 100644 index 1af914c..0000000 --- a/common/src/main/java/cc/toph/simplycompat/item/SimplyCompatToolMaterials.java +++ /dev/null @@ -1,113 +0,0 @@ -package cc.toph.simplycompat.item; - -import cc.toph.simplycompat.registry.ConfigRegistry.WEAPON_ATTRIBUTES; -import cc.toph.simplycompat.util.ToolMaterials; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public enum SimplyCompatToolMaterials implements ToolMaterials { - COPPER( - 1, - 125, - 4.5F, - 1.0F, - WEAPON_ATTRIBUTES.COPPER, - 8, - WEAPON_ATTRIBUTES.COPPER_ENABLED, - Items.COPPER_INGOT.arch$registryName() - ); - - private final int level; - private final int uses; - private final float speed; - private final float attackDamageBonus; - private final float damageModifier; - private final int enchantmentValue; - private final boolean enabled; - private final ResourceLocation repairIngredient; - - SimplyCompatToolMaterials( - int level, - int uses, - float speed, - float attackDamageBonus, - float damageModifier, - int enchantmentValue, - boolean enabled, - ResourceLocation repairIngredient - ) { - this.level = level; - this.uses = uses; - this.speed = speed; - this.attackDamageBonus = attackDamageBonus; - this.enchantmentValue = enchantmentValue; - this.damageModifier = damageModifier; - this.enabled = enabled; - this.repairIngredient = repairIngredient; - } - - - @Override - public String getName() { - return this.name().toLowerCase(); - } - - @Override - public String getIdentifier() { - return repairIngredient.toString(); - } - - @Override - public int getUses() { - return uses; - } - - @Override - public float getSpeed() { - return speed; - } - - @Override - public float getAttackDamageBonus() { - return attackDamageBonus; - } - - @Override - public float getDamageModifier() { - return damageModifier; - } - - @Override - public ResourceLocation getIngredientLocation() { - return repairIngredient; - } - - @Override - public int getLevel() { - return level; - } - - @Override - public int getEnchantmentValue() { - return enchantmentValue; - } - - @Override - public boolean isEnabled() { - return enabled; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(BuiltInRegistries.ITEM.get(repairIngredient)); - } - - @Override - public SimplyCompatToolMaterials[] getValues() { - return values(); - } - -} diff --git a/common/src/main/java/cc/toph/simplycompat/registry/CompatRegistry.java b/common/src/main/java/cc/toph/simplycompat/registry/CompatRegistry.java deleted file mode 100644 index 406e38b..0000000 --- a/common/src/main/java/cc/toph/simplycompat/registry/CompatRegistry.java +++ /dev/null @@ -1,77 +0,0 @@ -package cc.toph.simplycompat.registry; - -import cc.toph.simplycompat.compat.*; -import cc.toph.simplycompat.util.CompatRecord; -import com.drmangotea.tfmg.CreateTFMG; -import com.simibubi.create.Create; -import create_deep_dark.CreateDeepDarkMod; -import dqu.additionaladditions.AdditionalAdditions; -import net.purejosh.purecoppertools.PurecoppertoolsMod; - - -/** - * A registry for compatibility records. Each record represents - * a supported mod's integration setup. - * - *

Use {@link #registerAll()} to initialize all integrations.

- */ - -public final class CompatRegistry { - - /** - * Compatibility setup for the Create mod. - */ - public static final CompatRecord ADDITIONAL_ADDITIONS = new CompatRecord<>( - AdditionalAdditions.namespace, - "6.0.1", - AdditionalAdditionsToolMaterials.class - ); - - /** - * Compatibility setup for the Create mod. - */ - public static final CompatRecord CREATE = new CompatRecord<>( - Create.ID, - "0.5.1.j-55", - CreateToolMaterials.class - ); - - /** - * Compatibility setup for the Create Deep Dark mod. - */ - public static final CompatRecord CREATE_DEEP_DARK = new CompatRecord<>( - CreateDeepDarkMod.MODID, - "1.7.0", - CreateDeepDarkToolMaterials.class - ); - - /** - * Compatibility setup for the Create Deep Dark mod. - */ - public static final CompatRecord PURE_COPPER = new CompatRecord<>( - PurecoppertoolsMod.MODID, - "1.0.1", - PureCopperToolMaterials.class - ); - - /** - * Compatibility setup for the TFMG mod. - */ - public static final CompatRecord TFMG = new CompatRecord<>( - CreateTFMG.MOD_ID, - "0.9.3-1.20.1", - TFMGToolMaterials.class - ); - - /** - * Initializes all declared compat records. - */ - public static void registerAll() { - CompatRegistry.ADDITIONAL_ADDITIONS.register(); - CompatRegistry.PURE_COPPER.register(); - CompatRegistry.CREATE.register(); - CompatRegistry.CREATE_DEEP_DARK.register(); - CompatRegistry.TFMG.register(); - } -} - diff --git a/common/src/main/java/cc/toph/simplycompat/registry/ConfigRegistry.java b/common/src/main/java/cc/toph/simplycompat/registry/ConfigRegistry.java deleted file mode 100644 index d8da8af..0000000 --- a/common/src/main/java/cc/toph/simplycompat/registry/ConfigRegistry.java +++ /dev/null @@ -1,196 +0,0 @@ -package cc.toph.simplycompat.registry; - -import cc.toph.simplycompat.config.Config; -import cc.toph.simplycompat.config.ConfigProvider; - -public final class ConfigRegistry { - public static final class WEAPON_ATTRIBUTES { - - // Additional Additions // - public static float ROSE_GOLD; - public static boolean ROSE_GOLD_ENABLED; - public static float GILDED_NETHERITE; - public static boolean GILDED_NETHERITE_ENABLED; - - // Create // - public static float STURDY; - public static boolean STURDY_ENABLED; - - // Create: Deep Dark// - public static float ECHO; - public static boolean ECHO_ENABLED; - - // Pure Cooper Tools // - public static float COPPER; - public static boolean COPPER_ENABLED; - public static float EXPOSED_COPPER; - public static boolean EXPOSED_COPPER_ENABLED; - public static float WEATHERED_COPPER; - public static boolean WEATHERED_COPPER_ENABLED; - public static float OXIDIZED_COPPER; - public static boolean OXIDIZED_COPPER_ENABLED; - - // TFMG // - public static float ALUMINUM; - public static boolean ALUMINUM_ENABLED; - public static float LEAD; - public static boolean LEAD_ENABLED; - public static float STEEL; - public static boolean STEEL_ENABLED; - - - public static final ConfigProvider PROVIDER = new ConfigProvider("weapon_attributes"); - - public static void register() { - Config config = new Config(PROVIDER); - - if (CompatRegistry.ADDITIONAL_ADDITIONS.passCheck()) { - ROSE_GOLD = config.registerProp( - "rose_gold_damageModifier", - 3.0f, - "Rose Gold Damage Modifier" - ); - - ROSE_GOLD_ENABLED = config.registerProp( - "rose_gold_enabled", - true, - "Enable Rose Gold Swords" - ); - - GILDED_NETHERITE = config.registerProp( - "gilded_netherite_damageModifier", - 4.0f, - "Gilded Netherite Damage Modifier" - ); - - GILDED_NETHERITE_ENABLED = config.registerProp( - "gilded_netherite_enabled", - true, - "Enable Gilded Netherite Swords" - ); - } - - if (CompatRegistry.CREATE.passCheck()) { - STURDY = config.registerProp( - "sturdy_damageModifier", - 3.5f, - "Sturdy Damage Modifier" - ); - - STURDY_ENABLED = config.registerProp( - "sturdy_enabled", - true, - "Enable Sturdy Swords" - ); - } - - if (CompatRegistry.CREATE_DEEP_DARK.passCheck()) { - - ECHO = config.registerProp( - "echo_damageModifier", - 5.0f, - "Steel Echo Modifier" - ); - - ECHO_ENABLED = config.registerProp( - "echo_enabled", - true, - "Enable Echo Swords" - ); - } - - COPPER = config.registerProp( - "copper_damageModifier", - 3.0f, - "Copper Damage Modifier" - ); - - COPPER_ENABLED = config.registerProp( - "copper_enabled", - true, - "Enable Copper Swords" - ); - - if (CompatRegistry.PURE_COPPER.passCheck()) { - EXPOSED_COPPER = config.registerProp( - "exposed_copper_damageModifier", - 3.0f, - "Copper Damage Modifier" - ); - - EXPOSED_COPPER_ENABLED = config.registerProp( - "exposed_copper_enabled", - true, - "Enable Exposed Copper Swords" - ); - - WEATHERED_COPPER = config.registerProp( - "weathered_copper_damageModifier", - 3.0f, - "Copper Weathered Copper Modifier" - ); - - WEATHERED_COPPER_ENABLED = config.registerProp( - "exposed_copper_enabled", - true, - "Enable Exposed Copper Swords" - ); - - OXIDIZED_COPPER = config.registerProp( - "oxidized_copper_damageModifier", - 3.5f, - "Copper Weathered Copper Modifier" - ); - - OXIDIZED_COPPER_ENABLED = config.registerProp( - "oxidized_copper_enabled", - true, - "Enable Oxidized Copper Swords" - ); - } - - if (CompatRegistry.TFMG.passCheck()) { - ALUMINUM = config.registerProp( - "aluminum_damageModifier", - 2.5f, - "Aluminum Damage Modifier" - ); - - ALUMINUM_ENABLED = config.registerProp( - "aluminum_enabled", - true, - "Enable Aluminum Swords" - ); - - LEAD = config.registerProp( - "lead_damageModifier", - -0.5f, - "Lead Damage Modifier" - ); - - LEAD_ENABLED = config.registerProp( - "lead_enabled", - true, - "Enable Lead Swords" - ); - STEEL = config.registerProp( - "steel_damageModifier", - 3.5f, - "Steel Damage Modifier" - ); - - STEEL_ENABLED = config.registerProp( - "steel_enabled", - true, - "Enable Steel Swords" - ); - } - - config.register(); - } - } - - public static void registerConfigs() { - WEAPON_ATTRIBUTES.register(); - } -} diff --git a/common/src/main/java/cc/toph/simplycompat/registry/ItemsRegistry.java b/common/src/main/java/cc/toph/simplycompat/registry/ItemsRegistry.java deleted file mode 100644 index fac3642..0000000 --- a/common/src/main/java/cc/toph/simplycompat/registry/ItemsRegistry.java +++ /dev/null @@ -1,52 +0,0 @@ -package cc.toph.simplycompat.registry; - -import cc.toph.simplycompat.SimplyCompat; -import cc.toph.simplycompat.item.SimplyCompatSwordItem; -import cc.toph.simplycompat.item.SimplyCompatToolMaterials; -import cc.toph.simplycompat.util.ToolMaterials; -import cc.toph.simplycompat.util.WeaponType; -import dev.architectury.registry.registries.DeferredRegister; -import net.minecraft.core.registries.Registries; -import net.minecraft.world.item.Item; - -public final class ItemsRegistry { - - public static final DeferredRegister SWORDS = DeferredRegister.create(SimplyCompat.MOD_ID, Registries.ITEM); - - /** - * Registers a sword item with the given material and weapon type. - * - * @param material The material of the tool, which some of its properties/stats. - * @param type The type of the weapon, which affects its modifiers. - * @param The type of the enum that extends ToolMaterials. - */ - public static & ToolMaterials> void registerSword( - ToolMaterials material, - WeaponType type - ) { - String name = material.getName() + "_" + type.getWeaponNameSuffix(); - SWORDS.register(name, () -> - new SimplyCompatSwordItem<>(material, type)); - } - - /** - * Registers all sword items. Iterate through all available weapon types - * and tool materials. For each combination, the corresponding sword - * is registered using the private {@code registerSword} method. - *
- * This ensures that each defined material and weapon type combination is - * registered within the item registry for use within the mod. - */ - public static void registerSwords() { - - // Register "Vanilla" swords - for (WeaponType type : WeaponType.values()) { - for (SimplyCompatToolMaterials material : SimplyCompatToolMaterials.values()) { - if (material.isEnabled()) registerSword(material, type); - } - } - - CompatRegistry.registerAll(); - SWORDS.register(); - } -} diff --git a/common/src/main/java/cc/toph/simplycompat/util/CompatRecord.java b/common/src/main/java/cc/toph/simplycompat/util/CompatRecord.java deleted file mode 100644 index 2f44cae..0000000 --- a/common/src/main/java/cc/toph/simplycompat/util/CompatRecord.java +++ /dev/null @@ -1,53 +0,0 @@ -package cc.toph.simplycompat.util; - -import cc.toph.simplycompat.registry.ItemsRegistry; -import dev.architectury.platform.Platform; - -/** - * The CompatRecord class represents a compatibility record used for managing - * mod integrations and extending functionality based on certain requirements. - * This record checks whether a specific mod is present, its version is compatible, - * and registers tool materials and weapon types if the conditions are met. - * - * @param A type parameter that extends Enum and implements the ToolMaterials - * interface. This defines the supported tool materials for the integration. - * @param modId The unique identifier for the mod to be checked. - * @param requiredVersion The minimum version of the mod that is required for compatibility. - * @param toolMaterialClass The class representing the enumeration of tool materials to register. - */ -public record CompatRecord & ToolMaterials>( - String modId, - String requiredVersion, - Class toolMaterialClass -) { - - /** - * Checks whether the mod's version is loaded - * and passes the required version check. - */ - public boolean passCheck() { - if (Platform.isModLoaded(modId)) { - return Platform.getMod(modId) - .getVersion() - .compareTo(requiredVersion) >= 0; - } - return false; - } - - /** - * Registers swords for each enum constant in toolMaterialClass, - * if the material is enabled. - */ - public void register() { - if (!passCheck()) { - return; - } - for (WeaponType type : WeaponType.values()) { - for (E material : toolMaterialClass.getEnumConstants()) { - if (material.isEnabled()) { - ItemsRegistry.registerSword(material, type); - } - } - } - } -} diff --git a/common/src/main/resources/assets/simplycompat/lang/en_us.json b/common/src/main/resources/assets/progression/lang/en_us.json similarity index 100% rename from common/src/main/resources/assets/simplycompat/lang/en_us.json rename to common/src/main/resources/assets/progression/lang/en_us.json diff --git a/common/src/main/resources/assets/simplycompat/models/item/copper_longsword.json b/common/src/main/resources/assets/progression/models/item/copper_longsword.json similarity index 100% rename from common/src/main/resources/assets/simplycompat/models/item/copper_longsword.json rename to common/src/main/resources/assets/progression/models/item/copper_longsword.json diff --git a/common/src/main/resources/assets/simplycompat/models/item/copper_scythe.json b/common/src/main/resources/assets/progression/models/item/copper_scythe.json similarity index 100% rename from common/src/main/resources/assets/simplycompat/models/item/copper_scythe.json rename to common/src/main/resources/assets/progression/models/item/copper_scythe.json diff --git a/common/src/main/resources/assets/simplycompat/textures/item/copper_longsword.png b/common/src/main/resources/assets/progression/textures/item/copper_longsword.png similarity index 100% rename from common/src/main/resources/assets/simplycompat/textures/item/copper_longsword.png rename to common/src/main/resources/assets/progression/textures/item/copper_longsword.png diff --git a/common/src/main/resources/assets/simplycompat/textures/item/copper_scythe.png b/common/src/main/resources/assets/progression/textures/item/copper_scythe.png similarity index 100% rename from common/src/main/resources/assets/simplycompat/textures/item/copper_scythe.png rename to common/src/main/resources/assets/progression/textures/item/copper_scythe.png diff --git a/common/src/main/resources/data/simplycompat/weapon_attributes/copper_longsword.json b/common/src/main/resources/data/progression/weapon_attributes/copper_longsword.json similarity index 100% rename from common/src/main/resources/data/simplycompat/weapon_attributes/copper_longsword.json rename to common/src/main/resources/data/progression/weapon_attributes/copper_longsword.json diff --git a/common/src/main/resources/simplycompat.mixins.json b/common/src/main/resources/progression.mixins.json similarity index 79% rename from common/src/main/resources/simplycompat.mixins.json rename to common/src/main/resources/progression.mixins.json index 725dc96..dad7b60 100644 --- a/common/src/main/resources/simplycompat.mixins.json +++ b/common/src/main/resources/progression.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "cc.toph.simplycompat.mixin", + "package": "cc.toph.progression.mixin", "compatibilityLevel": "JAVA_17", "minVersion": "0.8", "client": [ diff --git a/fabric/src/main/java/cc/toph/progression/fabric/SimplyCompatFabric.java b/fabric/src/main/java/cc/toph/progression/fabric/SimplyCompatFabric.java new file mode 100644 index 0000000..6a0de53 --- /dev/null +++ b/fabric/src/main/java/cc/toph/progression/fabric/SimplyCompatFabric.java @@ -0,0 +1,18 @@ +package cc.toph.progression.fabric; + +import cc.toph.progression.Progression; +import net.fabricmc.api.ModInitializer; + +public final class SimplyCompatFabric implements ModInitializer { + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + // Run our common setup. + Progression.init(); + Item + } +} diff --git a/fabric/src/main/java/cc/toph/progression/fabric/SimplyCompatPlatformImpl.java b/fabric/src/main/java/cc/toph/progression/fabric/SimplyCompatPlatformImpl.java new file mode 100644 index 0000000..5423589 --- /dev/null +++ b/fabric/src/main/java/cc/toph/progression/fabric/SimplyCompatPlatformImpl.java @@ -0,0 +1,25 @@ +package cc.toph.progression.fabric; + +import cc.toph.progression.ProgressionPlatform; +import cc.toph.progression.util.Constants; +import net.fabricmc.loader.api.FabricLoader; + +import java.nio.file.Path; + +public class SimplyCompatPlatformImpl { + /** + * Implementation of {@link ProgressionPlatform#getConfigDirectory()}. + */ + public static Path getConfigDirectory() { + return FabricLoader.getInstance().getConfigDir(); + } + + /** + * Implementation of {@link ProgressionPlatform#getConfigDirectory()}. + */ + public static String getVersion() { + return FabricLoader.getInstance().getModContainer(Constants.MOD_ID).get().getMetadata().getVersion().toString(); + } + + +} \ No newline at end of file diff --git a/fabric/src/main/java/cc/toph/progression/fabric/client/SimplyCompatFabricClient.java b/fabric/src/main/java/cc/toph/progression/fabric/client/SimplyCompatFabricClient.java new file mode 100644 index 0000000..0e20407 --- /dev/null +++ b/fabric/src/main/java/cc/toph/progression/fabric/client/SimplyCompatFabricClient.java @@ -0,0 +1,11 @@ +package cc.toph.progression.fabric.client; + +import net.fabricmc.api.ClientModInitializer; + +public final class SimplyCompatFabricClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} diff --git a/fabric/src/main/java/cc/toph/simplycompat/fabric/SimplyCompatFabric.java b/fabric/src/main/java/cc/toph/simplycompat/fabric/SimplyCompatFabric.java deleted file mode 100644 index d8a388d..0000000 --- a/fabric/src/main/java/cc/toph/simplycompat/fabric/SimplyCompatFabric.java +++ /dev/null @@ -1,17 +0,0 @@ -package cc.toph.simplycompat.fabric; - -import cc.toph.simplycompat.SimplyCompat; -import net.fabricmc.api.ModInitializer; - -public final class SimplyCompatFabric implements ModInitializer { - - @Override - public void onInitialize() { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. - - // Run our common setup. - SimplyCompat.init(); - } -} diff --git a/fabric/src/main/java/cc/toph/simplycompat/fabric/SimplyCompatPlatformImpl.java b/fabric/src/main/java/cc/toph/simplycompat/fabric/SimplyCompatPlatformImpl.java deleted file mode 100644 index 39132f5..0000000 --- a/fabric/src/main/java/cc/toph/simplycompat/fabric/SimplyCompatPlatformImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package cc.toph.simplycompat.fabric; - -import cc.toph.simplycompat.SimplyCompat; -import cc.toph.simplycompat.SimplyCompatPlatform; -import net.fabricmc.loader.api.FabricLoader; - -import java.nio.file.Path; - -public class SimplyCompatPlatformImpl { - /** - * Implementation of {@link SimplyCompatPlatform#getConfigDirectory()}. - */ - public static Path getConfigDirectory() { - return FabricLoader.getInstance().getConfigDir(); - } - - /** - * Implementation of {@link SimplyCompatPlatform#getConfigDirectory()}. - */ - public static String getVersion() { - return FabricLoader.getInstance().getModContainer(SimplyCompat.MOD_ID).get().getMetadata().getVersion().toString(); - } - - -} \ No newline at end of file diff --git a/fabric/src/main/java/cc/toph/simplycompat/fabric/client/SimplyCompatFabricClient.java b/fabric/src/main/java/cc/toph/simplycompat/fabric/client/SimplyCompatFabricClient.java deleted file mode 100644 index 74487ff..0000000 --- a/fabric/src/main/java/cc/toph/simplycompat/fabric/client/SimplyCompatFabricClient.java +++ /dev/null @@ -1,11 +0,0 @@ -package cc.toph.simplycompat.fabric.client; - -import net.fabricmc.api.ClientModInitializer; - -public final class SimplyCompatFabricClient implements ClientModInitializer { - - @Override - public void onInitializeClient() { - // This entrypoint is suitable for setting up client-specific logic, such as rendering. - } -} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index aa762f3..82488d6 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -4,7 +4,9 @@ "version": "${version}", "name": "Simply Compat", "description": "This is an example description! Tell everyone what your mod is about!", - "authors": ["Me!"], + "authors": [ + "Me!" + ], "contact": { "homepage": "https://fabricmc.net/", "sources": "https://github.com/FabricMC/fabric-example-mod" @@ -13,10 +15,16 @@ "icon": "assets/simplycompat/icon.png", "environment": "*", "entrypoints": { - "main": ["cc.toph.simplycompat.fabric.SimplyCompatFabric"], - "client": ["cc.toph.simplycompat.fabric.client.SimplyCompatFabricClient"] + "main": [ + "cc.toph.simplycompat.fabric.SimplyCompatFabric" + ], + "client": [ + "cc.toph.simplycompat.fabric.client.SimplyCompatFabricClient" + ] }, - "mixins": ["simplycompat.mixins.json"], + "mixins": [ + "progression.mixins.json" + ], "depends": { "fabricloader": ">=0.16.10", "minecraft": "~1.20.1", diff --git a/forge/build.gradle b/forge/build.gradle index 149bf51..c64017d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -15,13 +15,13 @@ loom { runs { data { data() - programArgs "--all", "--mod", "simplycompat" + programArgs "--all", "--mod", "progression" programArgs "--output", generatedResources.absolutePath programArgs "--existing", existingResources.absolutePath } } forge { - mixinConfig "simplycompat.mixins.json" + mixinConfig "progression.mixins.json" } } diff --git a/forge/src/main/java/cc/toph/simplycompat/forge/SimplyCompatForge.java b/forge/src/main/java/cc/toph/progression/forge/ProgressionForge.java similarity index 71% rename from forge/src/main/java/cc/toph/simplycompat/forge/SimplyCompatForge.java rename to forge/src/main/java/cc/toph/progression/forge/ProgressionForge.java index 44223d5..888e7be 100644 --- a/forge/src/main/java/cc/toph/simplycompat/forge/SimplyCompatForge.java +++ b/forge/src/main/java/cc/toph/progression/forge/ProgressionForge.java @@ -1,7 +1,8 @@ -package cc.toph.simplycompat.forge; +package cc.toph.progression.forge; -import cc.toph.simplycompat.SimplyCompat; -import cc.toph.simplycompat.forge.datagen.DataGeneration; +import cc.toph.progression.Progression; +import cc.toph.progression.forge.datagen.DataGeneration; +import cc.toph.progression.util.Constants; import dev.architectury.platform.forge.EventBuses; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; @@ -12,20 +13,20 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -@Mod(SimplyCompat.MOD_ID) -public final class SimplyCompatForge { +@Mod(Constants.MOD_ID) +public final class ProgressionForge { private static final Map EVENT_BUSSES = Collections.synchronizedMap(new HashMap<>()); @SuppressWarnings("removal") - public SimplyCompatForge() { + public ProgressionForge() { // Submit our event bus to let Architectury API register our content on the right time. var modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - EventBuses.registerModEventBus(SimplyCompat.MOD_ID, modEventBus); + EventBuses.registerModEventBus(Constants.MOD_ID, modEventBus); // Run our common setup. - SimplyCompat.init(); + Progression.init(); // DataGen Listener modEventBus.addListener(DataGeneration::generate); diff --git a/forge/src/main/java/cc/toph/progression/forge/ProgressionPlatformImpl.java b/forge/src/main/java/cc/toph/progression/forge/ProgressionPlatformImpl.java new file mode 100644 index 0000000..a7cee8f --- /dev/null +++ b/forge/src/main/java/cc/toph/progression/forge/ProgressionPlatformImpl.java @@ -0,0 +1,26 @@ +package cc.toph.progression.forge; + +import cc.toph.progression.ProgressionPlatform; +import cc.toph.progression.util.Constants; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.loading.FMLPaths; + +import java.nio.file.Path; + +public class ProgressionPlatformImpl { + /** + * Implementation of {@link ProgressionPlatform#getConfigDirectory()}. + */ + public static Path getConfigDirectory() { + return FMLPaths.CONFIGDIR.get(); + } + + /** + * Implementation of {@link ProgressionPlatform#getConfigDirectory()}. + */ + public static String getVersion() { + return ModList.get().getModContainerById(Constants.MOD_ID).map(it -> it.getModInfo().getVersion().toString()).orElseThrow(); + } + + +} \ No newline at end of file diff --git a/forge/src/main/java/cc/toph/progression/forge/datagen/DataGeneration.java b/forge/src/main/java/cc/toph/progression/forge/datagen/DataGeneration.java new file mode 100644 index 0000000..38eb9c1 --- /dev/null +++ b/forge/src/main/java/cc/toph/progression/forge/datagen/DataGeneration.java @@ -0,0 +1,25 @@ +package cc.toph.progression.forge.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.data.event.GatherDataEvent; + +import java.util.concurrent.CompletableFuture; + +public class DataGeneration { + + public static void generate(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + PackOutput packOutput = generator.getPackOutput(); + CompletableFuture lookupProvider = event.getLookupProvider(); + + generator.addProvider(event.includeServer(), new ProgressionRecipes(packOutput)); + + BlockTagsProvider blockTags = new ProgressionTags.BlockTags(packOutput, lookupProvider, event.getExistingFileHelper()); + generator.addProvider(event.includeServer(), blockTags); + generator.addProvider(event.includeServer(), new ProgressionTags.ItemTags(packOutput, lookupProvider, blockTags.contentsGetter(), event.getExistingFileHelper())); + + } +} \ No newline at end of file diff --git a/forge/src/main/java/cc/toph/progression/forge/datagen/ProgressionRecipes.java b/forge/src/main/java/cc/toph/progression/forge/datagen/ProgressionRecipes.java new file mode 100644 index 0000000..14a5e59 --- /dev/null +++ b/forge/src/main/java/cc/toph/progression/forge/datagen/ProgressionRecipes.java @@ -0,0 +1,324 @@ +package cc.toph.progression.forge.datagen; + +import cc.toph.progression.registry.ItemsRegistry; +import cc.toph.progression.util.Constants; +import net.minecraft.advancements.critereon.InventoryChangeTrigger; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraftforge.common.Tags; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Consumer; + +public class ProgressionRecipes extends RecipeProvider { + public ProgressionRecipes(PackOutput packOutput) { + super(packOutput); + } + + @Override + protected void buildRecipes(@NotNull Consumer consumer) { + buildArmor(consumer); + buildSwords(consumer); + buildTools(consumer); + // buildSS(consumer); + } + + private void buildArmor(@NotNull Consumer consumer) { + ItemsRegistry.Armors.getArmors().forEach(armor -> { + var tier = armor.getTier(); + switch (armor.getType()) { + case HELMET -> ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, armor) + .pattern("III") + .pattern("I I") + .pattern(" ") + .define('I', tier.getIngredientTag()) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + case CHESTPLATE -> ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, armor) + .pattern("I I") + .pattern("III") + .pattern("III") + .define('I', tier.getIngredientTag()) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + case LEGGINGS -> ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, armor) + .pattern("III") + .pattern("I I") + .pattern("I I") + .define('I', tier.getIngredientTag()) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + case BOOTS -> ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, armor) + .pattern(" ") + .pattern("I I") + .pattern("I I") + .define('I', tier.getIngredientTag()) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + default -> throw new IllegalStateException("Unexpected value: " + armor.getType()); + } + }); + } + + private void buildTools(@NotNull Consumer consumer) { + ItemsRegistry.Tools.getAxes().forEach(axe -> { + var tier = axe.getTier(); + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, axe) + .pattern("II") + .pattern("SI") + .pattern("S ") + .define('I', tier.getIngredientTag()) + .define('S', Tags.Items.RODS_WOODEN) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + }); + ItemsRegistry.Tools.getPickAxes().forEach(pickAxes -> { + var tier = pickAxes.getTier(); + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, pickAxes) + .pattern("III") + .pattern(" S ") + .pattern(" S ") + .define('I', tier.getIngredientTag()) + .define('S', Tags.Items.RODS_WOODEN) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + }); + ItemsRegistry.Tools.getShovels().forEach(shovel -> { + var tier = shovel.getTier(); + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, shovel) + .pattern("I") + .pattern("S") + .pattern("S") + .define('I', tier.getIngredientTag()) + .define('S', Tags.Items.RODS_WOODEN) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + }); + ItemsRegistry.Tools.getHoes().forEach(hoe -> { + var tier = hoe.getTier(); + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, hoe) + .pattern("II") + .pattern("S ") + .pattern("S ") + .define('I', tier.getIngredientTag()) + .define('S', Tags.Items.RODS_WOODEN) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + }); + } + + private void buildSwords(@NotNull Consumer consumer) { + ItemsRegistry.Swords.getSwords().forEach(sword -> { + var tier = sword.getTier(); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, sword) + .pattern("I") + .pattern("I") + .pattern("S") + .define('I', tier.getIngredientTag()) + .define('S', Tags.Items.RODS_WOODEN) + .group(Constants.MOD_ID) + .unlockedBy("has_" + tier.getName(), InventoryChangeTrigger.TriggerInstance.hasItems( + tier.getIngredientAsItem())) + // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) + .save(consumer); + }); + } +} + +// if (sword instanceof SimplyCompatSwordItem SCSword) { +// +/// / TODO: Some swords wont follow the usual recipe +/// / if (sword.getId() != ) {} +// +//var material = SCSword.getMaterial(); +// switch (SCSword.getType()) { +// case CHAKRAM -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern("YXY") +// .pattern("X X") +// .pattern("Y#Y") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) +// .save(consumer); +// case CLAYMORE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" YX") +// .pattern("YXY") +// .pattern("#Y ") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case CUTLASS -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" Y") +// .pattern("XX") +// .pattern("# ") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case GLAIVE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" X") +// .pattern(" #X") +// .pattern("# ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case GREATAXE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern("XXX") +// .pattern("Y#Y") +// .pattern(" # ") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case GREATHAMMER -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern("XXX") +// .pattern("YYY") +// .pattern(" # ") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case HALBERD -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" XY") +// .pattern("X#X") +// .pattern("# ") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case KATANA -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" ") +// .pattern("#XX") +// .pattern(" ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case LONGSWORD -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern("# ") +// .pattern(" X ") +// .pattern(" X") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case RAPIER -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" X") +// .pattern(" X ") +// .pattern("# ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case SAI -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" ") +// .pattern(" X") +// .pattern("# ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case SCYTHE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern("XX#") +// .pattern("X# ") +// .pattern("# ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case SPEAR -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" X") +// .pattern(" # ") +// .pattern("# ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case TWINBLADE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" X") +// .pattern(" # ") +// .pattern("X ") +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +// case WARGLAIVE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) +// .pattern(" Y ") +// .pattern("X#X") +// .pattern(" ") +// .define('Y', Items.IRON_NUGGET) +// .define('X', SCSword.getTier().getRepairIngredient()) +// .define('#', Tags.Items.RODS_WOODEN) +// .group(Constants.MOD_ID) +// .unlockedBy("has_" + tier.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( +// BuiltInRegistries.ITEM.get(tier.getIngredientLocation()))) +// .save(consumer); +//default -> throw new IllegalStateException("Unexpected value: " + SCSword.getType()); +// } +// } else { +// throw new IllegalStateException("Unexpected item type: " + sword.getClass().getName() + "or"); +// } \ No newline at end of file diff --git a/forge/src/main/java/cc/toph/progression/forge/datagen/ProgressionTags.java b/forge/src/main/java/cc/toph/progression/forge/datagen/ProgressionTags.java new file mode 100644 index 0000000..602964f --- /dev/null +++ b/forge/src/main/java/cc/toph/progression/forge/datagen/ProgressionTags.java @@ -0,0 +1,43 @@ +package cc.toph.progression.forge.datagen; + +import cc.toph.progression.tag.Tags; +import cc.toph.progression.util.Constants; +import cc.toph.progression.util.Helpers; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class ProgressionTags { + + public static final class BlockTags extends BlockTagsProvider { + public BlockTags(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, Constants.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.@NotNull Provider provider) { + } + } + + public static final class ItemTags extends ItemTagsProvider { + public ItemTags(PackOutput arg, CompletableFuture completableFuture, CompletableFuture> completableFuture2, @Nullable ExistingFileHelper existingFileHelper) { + super(arg, completableFuture, completableFuture2, Constants.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.@NotNull Provider provider) { + // Iterate through all tag values and add them + for (Tags.ITEMS itemTag : Tags.ITEMS.values()) { + tag(itemTag.tag()).addOptional(Helpers.buildLocation(itemTag.getName())); + } + } + } +} + diff --git a/forge/src/main/java/cc/toph/simplycompat/forge/SimplyCompatPlatformImpl.java b/forge/src/main/java/cc/toph/simplycompat/forge/SimplyCompatPlatformImpl.java deleted file mode 100644 index 9b03f17..0000000 --- a/forge/src/main/java/cc/toph/simplycompat/forge/SimplyCompatPlatformImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package cc.toph.simplycompat.forge; - -import cc.toph.simplycompat.SimplyCompat; -import cc.toph.simplycompat.SimplyCompatPlatform; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.loading.FMLPaths; - -import java.nio.file.Path; - -public class SimplyCompatPlatformImpl { - /** - * Implementation of {@link SimplyCompatPlatform#getConfigDirectory()}. - */ - public static Path getConfigDirectory() { - return FMLPaths.CONFIGDIR.get(); - } - - /** - * Implementation of {@link SimplyCompatPlatform#getConfigDirectory()}. - */ - public static String getVersion() { - return ModList.get().getModContainerById(SimplyCompat.MOD_ID).map(it -> it.getModInfo().getVersion().toString()).orElseThrow(); - } - - -} \ No newline at end of file diff --git a/forge/src/main/java/cc/toph/simplycompat/forge/datagen/DataGeneration.java b/forge/src/main/java/cc/toph/simplycompat/forge/datagen/DataGeneration.java deleted file mode 100644 index 253fccd..0000000 --- a/forge/src/main/java/cc/toph/simplycompat/forge/datagen/DataGeneration.java +++ /dev/null @@ -1,20 +0,0 @@ -package cc.toph.simplycompat.forge.datagen; - -import net.minecraft.data.DataGenerator; -import net.minecraft.data.PackOutput; -import net.minecraftforge.data.event.GatherDataEvent; - -public class DataGeneration { - - public static void generate(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - PackOutput packOutput = generator.getPackOutput(); -// CompletableFuture lookupProvider = event.getLookupProvider(); - - generator.addProvider(event.includeServer(), new SimplyCompatRecipes(packOutput)); -// -// generator.addProvider(event.includeClient(), new SimplyCompatItemModels(packOutput, event.getExistingFileHelper())); -// generator.addProvider(event.includeServer(), new LootTableProvider(packOutput, Collections.emptySet(), -// List.of(new LootTableProvider.SubProviderEntry(SimplyCompatLootTables::new, LootContextParamSets.BLOCK)))); - } -} \ No newline at end of file diff --git a/forge/src/main/java/cc/toph/simplycompat/forge/datagen/SimplyCompatRecipes.java b/forge/src/main/java/cc/toph/simplycompat/forge/datagen/SimplyCompatRecipes.java deleted file mode 100644 index de87af3..0000000 --- a/forge/src/main/java/cc/toph/simplycompat/forge/datagen/SimplyCompatRecipes.java +++ /dev/null @@ -1,203 +0,0 @@ -package cc.toph.simplycompat.forge.datagen; - -import cc.toph.simplycompat.SimplyCompat; -import cc.toph.simplycompat.item.SimplyCompatSwordItem; -import cc.toph.simplycompat.registry.ItemsRegistry; -import net.minecraft.advancements.critereon.InventoryChangeTrigger; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.data.recipes.RecipeCategory; -import net.minecraft.data.recipes.RecipeProvider; -import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraftforge.common.Tags; -import org.jetbrains.annotations.NotNull; - -import java.util.function.Consumer; - -public class SimplyCompatRecipes extends RecipeProvider { - public SimplyCompatRecipes(PackOutput packOutput) { - super(packOutput); - } - - @Override - protected void buildRecipes(@NotNull Consumer consumer) { - ItemsRegistry.SWORDS.forEach(sword -> buildRecipe(BuiltInRegistries.ITEM.get(sword.getId()), consumer)); - } - - private void buildRecipe(Item sword, Consumer consumer) { - - if (sword instanceof SimplyCompatSwordItem SCSword) { - - // TODO: Some swords wont follow the usual recipe - // if (sword.getId() != ) {} - - var material = SCSword.getMaterial(); - switch (SCSword.getType()) { - case CHAKRAM -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern("YXY") - .pattern("X X") - .pattern("Y#Y") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - // ItemPredicate.Builder.item().of(Tags.Items.GEMS_DIAMOND).build())) - .save(consumer); - case CLAYMORE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" YX") - .pattern("YXY") - .pattern("#Y ") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case CUTLASS -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" Y") - .pattern("XX") - .pattern("# ") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case GLAIVE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" X") - .pattern(" #X") - .pattern("# ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case GREATAXE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern("XXX") - .pattern("Y#Y") - .pattern(" # ") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case GREATHAMMER -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern("XXX") - .pattern("YYY") - .pattern(" # ") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case HALBERD -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" XY") - .pattern("X#X") - .pattern("# ") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case KATANA -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" ") - .pattern("#XX") - .pattern(" ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case LONGSWORD -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern("# ") - .pattern(" X ") - .pattern(" X") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case RAPIER -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" X") - .pattern(" X ") - .pattern("# ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case SAI -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" ") - .pattern(" X") - .pattern("# ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case SCYTHE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern("XX#") - .pattern("X# ") - .pattern("# ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case SPEAR -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" X") - .pattern(" # ") - .pattern("# ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case TWINBLADE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" X") - .pattern(" # ") - .pattern("X ") - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - case WARGLAIVE -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, SCSword) - .pattern(" Y ") - .pattern("X#X") - .pattern(" ") - .define('Y', Items.IRON_NUGGET) - .define('X', SCSword.getTier().getRepairIngredient()) - .define('#', Tags.Items.RODS_WOODEN) - .group(SimplyCompat.MOD_ID) - .unlockedBy("has_" + material.getName().toLowerCase(), InventoryChangeTrigger.TriggerInstance.hasItems( - BuiltInRegistries.ITEM.get(material.getIngredientLocation()))) - .save(consumer); - default -> throw new IllegalStateException("Unexpected value: " + SCSword.getType()); - } - } else { - throw new IllegalStateException("Unexpected item type: " + sword.getClass().getName() + "or"); - } - } -} \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 3b525ae..db97f34 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -5,9 +5,9 @@ loaderVersion = "[47,)" license = "MIT" [[mods]] -modId = "simplycompat" +modId = "progression" version = "${version}" -displayName = "Simply Compat" +displayName = "Progression" authors = "TophC7" description = ''' A Simple mod for extended compat in Simply Swords! diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta index 694042a..9528d7b 100644 --- a/forge/src/main/resources/pack.mcmeta +++ b/forge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "Simply Compat", + "description": "Create Progression", "forge:server_data_pack_format": 15, "pack_format": 15 } diff --git a/gradle.properties b/gradle.properties index f6d1a65..9c1ceca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx6G org.gradle.parallel=true # Mod properties mod_version=1.0.0 -maven_group=cc.toph.simplycompat -archives_name=simplycompat +maven_group=cc.toph.progression +archives_name=progression enabled_platforms=fabric,forge # Minecraft properties minecraft_version=1.20.1 diff --git a/settings.gradle b/settings.gradle index 0714718..731eced 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { } } -rootProject.name = 'simplycompat' +rootProject.name = 'progression' include 'common' include 'fabric' diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..8e6230c --- /dev/null +++ b/shell.nix @@ -0,0 +1,50 @@ +# Shell for bootstrapping flake-enabled nix and other tooling + +let + nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11"; + pkgs = import nixpkgs { + config = { }; + overlays = [ ]; + }; + runtimeLibs = with pkgs; [ + glfw3-minecraft + openal + + ## openal + alsa-lib + libjack2 + libpulseaudio + pipewire + + ## glfw + libGL + libglvnd + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXxf86vm + + udev # oshi + + vulkan-loader # VulkanMod's lwjgl + + freetype + fontconfig + flite + + # jdk17 + # gradle_8 + ]; +in +pkgs.mkShellNoCC { + packages = with pkgs; [ + # jdk17 + gradle_8 + ]; + buildInputs = runtimeLibs; + LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath runtimeLibs; +}