diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c46143bc4..5b8eac92b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,19 @@ -name: Base Metals 1.20.6 CI +name: Base Metals 1.21.1 CI on: push: branches: - - master-1.20.6 + - master-1.21.1 - 'feature/**' pull_request: branches: - - master-1.20.6 + - master-1.21.1 permissions: contents: read concurrency: - group: basemetals-1.20.6-${{ github.workflow }}-${{ github.ref }} + group: basemetals-1.21.1-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -60,6 +60,9 @@ jobs: "$RUNNER_TEMP/nbt-tests/bin/pip" install nbtlib==2.0.4 numpy==2.4.6 "$RUNNER_TEMP/nbt-tests/bin/python" -m unittest discover -s tools/validation -p 'test_*.py' + - name: Test upgrade log boundaries + run: node --test tools/validation/test_painting_registry.js + - name: Build, test, and audit first candidate run: | chmod +x ./gradlew @@ -68,9 +71,9 @@ jobs: --no-daemon --stacktrace first="$RUNNER_TEMP/basemetals-first" mkdir -p "$first" - cp build/libs/BaseMetals-3.1.0.120061.jar "$first/" - cp build/libs/BaseMetals-3.1.0.120061-sources.jar "$first/" - cp build/libs/BaseMetals-3.1.0.120061-javadoc.jar "$first/" + cp build/libs/BaseMetals-3.1.1.121011.jar "$first/" + cp build/libs/BaseMetals-3.1.1.121011-sources.jar "$first/" + cp build/libs/BaseMetals-3.1.1.121011-javadoc.jar "$first/" cp build/release/SHA256SUMS "$first/" - name: Rebuild and prove byte-identical archives @@ -78,9 +81,9 @@ jobs: ./gradlew clean assemble verifyReleaseArtifacts writeReleaseChecksums \ -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ --no-daemon --stacktrace - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120061.jar" build/libs/BaseMetals-3.1.0.120061.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120061-sources.jar" build/libs/BaseMetals-3.1.0.120061-sources.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120061-javadoc.jar" build/libs/BaseMetals-3.1.0.120061-javadoc.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121011.jar" build/libs/BaseMetals-3.1.1.121011.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121011-sources.jar" build/libs/BaseMetals-3.1.1.121011-sources.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121011-javadoc.jar" build/libs/BaseMetals-3.1.1.121011-javadoc.jar cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS - name: Run all required GameTests @@ -92,14 +95,14 @@ jobs: - name: Install official Forge packaged runtimes id: forge-runtimes run: | - server_runtime="$RUNNER_TEMP/forge-1.20.6-50.2.0-server" - client_runtime="$RUNNER_TEMP/forge-1.20.6-50.2.0-client" - installer="$RUNNER_TEMP/forge-1.20.6-50.2.0-installer.jar" + server_runtime="$RUNNER_TEMP/forge-1.21.1-52.1.0-server" + client_runtime="$RUNNER_TEMP/forge-1.21.1-52.1.0-client" + installer="$RUNNER_TEMP/forge-1.21.1-52.1.0-installer.jar" mkdir -p "$server_runtime" "$client_runtime" curl --fail --location --retry 3 \ --output "$installer" \ - https://maven.minecraftforge.net/net/minecraftforge/forge/1.20.6-50.2.0/forge-1.20.6-50.2.0-installer.jar - echo "8789098B077F5486449311A11DC05E977FEB9430913CB15F30B21A2D8AA213EA $installer" | sha256sum --check --strict + https://maven.minecraftforge.net/net/minecraftforge/forge/1.21.1-52.1.0/forge-1.21.1-52.1.0-installer.jar + echo "F1B620F2879AD6A5BBE15DABA4D8F81EAB9F5E08004967604960B98996BDEBC4 $installer" | sha256sum --check --strict ( cd "$server_runtime" java -jar "$installer" --installServer @@ -142,13 +145,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.20.6-${{ github.sha }} + name: BaseMetals-1.21.1-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/BaseMetals-3.1.0.120061.jar - build/libs/BaseMetals-3.1.0.120061-sources.jar - build/libs/BaseMetals-3.1.0.120061-javadoc.jar + build/libs/BaseMetals-3.1.1.121011.jar + build/libs/BaseMetals-3.1.1.121011-sources.jar + build/libs/BaseMetals-3.1.1.121011-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -156,7 +159,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.20.6-diagnostics-${{ github.sha }} + name: BaseMetals-1.21.1-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6b5328052..39f539a7d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.20.6 + - master-1.21.1 - 'feature/**' pull_request: branches: - - master-1.20.6 + - master-1.21.1 permissions: actions: read diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml index 2c47d1281..2f2c732be 100644 --- a/.github/workflows/validate-gradle-build.yml +++ b/.github/workflows/validate-gradle-build.yml @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper on: push: branches: - - master-1.20.6 + - master-1.21.1 - 'feature/**' pull_request: branches: - - master-1.20.6 + - master-1.21.1 permissions: contents: read diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 796cb2ceb..1ca3b4d5a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,16 @@ +Base Metals 3.1.1.121011 + +- Fix startup failures when Base Metals is added to an existing modern world, including worlds with LZ4-compressed chunks, external chunks or empty region files. +- Stop old level.dat_old backups from replacing current player data or enabling legacy terrain protection. +- Keep genuine legacy upgrades, reloads and later-opened chunks supported, including chunks in nested custom dimensions. +- Port the released 1.20.6 version to Minecraft 1.21.1 and Forge 52.1.0, keeping Java 21. +- Keep raw metals, Kiri's ore overlays, filled buckets, High/Low Fantasy and the existing gameplay fixes. +- Use vanilla copper forms where they overlap, while keeping old Base Metals items and blocks valid in saves. +- Accept both copper versions in shared ingredients and keep recycling within the material cost. +- Update recipes, tags, loot, advancements and enchantments for Minecraft 1.21's data formats. +- Keep arrows and bolts tied to their firing weapon so native enchantments apply after material damage. +- Use the published OreSpawn 4.1.0.121011 release with the same eleven ore rules and copper defaults. + Base Metals 3.1.0.120061 - Port the released 1.20.1 version to Minecraft 1.20.6, Forge 50.2.0 and Java 21. diff --git a/README.md b/README.md index a62c98279..d9cbe9857 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) [![CurseForge downloads](https://cf.way2muchnoise.eu/full_base-metals_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) [![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_base-metals_all.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) -[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-1.20.6)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.20.6) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-1.21.1)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.21.1) # Base Metals @@ -12,21 +12,21 @@ shields, bows, crossbows, arrows, and bolts. The mod also includes Crack Hammers, scythes, metal anvils, the human detector, villager trades, advancements, and structure loot. -This is the Minecraft 1.20.6 Forge version, `3.1.0.120061`. It keeps the -fixes and features from the released 1.20.1 version, including raw metals, ore texture +This is the Minecraft 1.21.1 Forge version, `3.1.1.121011`. It keeps the +fixes and features from the released 1.20.6 version, including raw metals, ore texture overlays and High/Low Fantasy modes. Existing Base Metals items and blocks keep their registry IDs. OreSpawn handles ore generation; MMDLib and Additional Loot Tables are no longer needed. ## Requirements -- Minecraft `1.20.6` -- Forge `50.2.0` or newer in the Minecraft 1.20.6 Forge 50 line +- Minecraft `1.21.1` +- Forge `52.1.0` or newer in the Minecraft 1.21.1 Forge 52 line - A current Java 21 runtime -- OreSpawn `[4.1.0.120061,5.0.0)` on both client and server +- OreSpawn `[4.1.0.121011,5.0.0)` on both client and server -This version uses OreSpawn `4.1.0.120061`. Put -`BaseMetals-3.1.0.120061.jar` and a compatible OreSpawn JAR in the `mods` +This version uses OreSpawn `4.1.0.121011`. Put +`BaseMetals-3.1.1.121011.jar` and a compatible OreSpawn JAR in the `mods` directory. MMDLib and Additional Loot Tables must not be carried forward from an older installation. Mineralogy is optional. @@ -44,6 +44,12 @@ limits which items you can make. Recipes use Forge tags, so compatible ores, ingots, powders, plates, rods, gears and other components from different mods can be used together. +Where vanilla has the same copper forms, recipes now produce vanilla ingots, +blocks, doors, trapdoors, cut-copper slabs and stairs. The old Base Metals items +and blocks stay registered and continue working in existing saves. Shared +ingredient tags accept both versions, so older items and the rest of the copper +recipe chains remain usable. Other Base Metals copper equipment is unchanged. + Notable mechanics include: - Crack Hammers crush supported mined blocks through the data-driven @@ -130,15 +136,19 @@ is unavailable. Always perform the first upgrade on a copy of the world and keep the untouched original. Read [Migration](docs/MIGRATION.md) before starting an upgraded world. +Adding Base Metals to a modern world does not trigger the old numeric-ID +conversion just because an older backup is present. Existing player data stays +in place; genuine legacy upgrades still make backups before changing saved data. + ## Mod and data-pack compatibility Forge item, block, and fluid tags are Base Metals' public compatibility API. Compatible tags and the existing recipe data for Mekanism, Thermal, Tinkers' -Construct and Ender IO are retained, but these integrations are not supported -on this target: those mods do not publish Forge 1.20.6 builds. Their older jars -must not be added to this instance. No optional integration API is required to -compile or launch Base Metals. +Construct and Ender IO are retained, but their Java integrations are not enabled +in this Forge 1.21.1 port. Do not add jars made for older Minecraft versions or +NeoForge to this instance. No optional integration API is required to compile +or launch Base Metals. The normal development client loads only Base Metals and OreSpawn. @@ -185,7 +195,7 @@ artifacts. GameTests, smoke probes, migration fixtures, and reference sources are isolated from the published JAR. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.0.120061`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121011`. Report defects and compatibility problems through the [Base Metals issue tracker](https://github.com/MinecraftModDevelopmentMods/BaseMetals/issues). diff --git a/build.gradle b/build.gradle index b0ef12d73..eed2f0646 100644 --- a/build.gradle +++ b/build.gradle @@ -9,12 +9,12 @@ plugins { ext.mavenizerCompatibilityJar = layout.projectDirectory.file( 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar') ext.mavenizerCompatibilitySha256 = - '4B14145595E900F178A082F2253A756F63897E6F61C2B8B5E7C819B82CD79E8C' + '019032A4A26ECB473D403EF017054D5892CE59A9904E8831B452287CD756397E' ext.mavenizerFixtureChecksums = [ 'minecraft-mavenizer-0.5.21-orespawn-compat.jar': mavenizerCompatibilitySha256, - 'minecraft-source-compatibility.json': '931DAB31C238D8C9C38239671A61DA0942ADADF80149D6359197EE80A16380A8', - 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': 'A140C21312C2A5A8AFC56DC0B037B94D222CA68A7B868512B91684CD3754B650', + 'minecraft-source-compatibility.json': '7F669F225520D0382E76991A8A3E5E4020840F0FA975F7DCB86681D7E7C3F766', + 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': '84FEA234619CC2D1931E609B22B6E5D96F59366F7D6C2783C3BEE0F726F3E876', 'LICENSE-MAVENIZER.txt': '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331' ] // Mavenizer runs during configuration, so verify its inputs before configuring Forge. @@ -26,7 +26,7 @@ mavenizerFixtureChecksums.each { name, expected -> } } -// Forge 50 needs no source repairs. The sealed fixture records that result +// Forge 52 needs no source repairs. The sealed fixture records that result // and stays separate from the mod and its runtime dependencies. fgtools.configure('mavenizer') { classpath.from(mavenizerCompatibilityJar) diff --git a/ci-fixtures/tools/README.md b/ci-fixtures/tools/README.md index 0fed77872..62708bcbe 100644 --- a/ci-fixtures/tools/README.md +++ b/ci-fixtures/tools/README.md @@ -2,7 +2,7 @@ This directory contains a build-only derivative of MinecraftForge's MinecraftMavenizer `0.5.21`. It is used only while ForgeGradle prepares the -exact Forge `1.20.6-50.2.0` development dependency and is excluded from every +exact Forge `1.21.1-52.1.0` development dependency and is excluded from every Base Metals publication artifact. ## Provenance and licence @@ -21,14 +21,14 @@ declaration and one accessor in that record. Missing, partial, duplicate or ambiguous states fail preparation. Targets without an explicit rule set are left unchanged. -Forge `1.20.6-50.2.0` compiles without source compatibility edits. Its explicit +Forge `1.21.1-52.1.0` compiles without source compatibility edits. Its explicit zero-rule entry proves that result is intentional and target-qualified rather than an accidental fall-through. A marker beside Mavenizer's output records the target and manifest SHA-256. Reprocessing the same source is idempotent. The derivative also propagates Gradle offline mode when the build sets `ORESPAWN_MAVENIZER_OFFLINE=true`. Mavenizer itself runs on Java 25; Base Metals -and Minecraft 1.20.6 continue to compile for Java 21. +and Minecraft 1.21.1 continue to compile for Java 21. ## Rebuild diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar index c37dc57b3..3bc4e389f 100644 Binary files a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar and b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar differ diff --git a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch index 132011e06..a8739436d 100644 --- a/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch +++ b/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.patch @@ -371,7 +371,7 @@ index 0000000..702d759 +{ + "schema": 1, + "targets": { -+ "net.minecraftforge:forge:1.20.6-50.2.0": { ++ "net.minecraftforge:forge:1.21.1-52.1.0": { + "expectedApplications": 0, + "rules": [] + } @@ -379,4 +379,3 @@ index 0000000..702d759 +} -- 2.55.0.windows.3 - diff --git a/ci-fixtures/tools/minecraft-source-compatibility.json b/ci-fixtures/tools/minecraft-source-compatibility.json index 702d7594a..7070e4993 100644 --- a/ci-fixtures/tools/minecraft-source-compatibility.json +++ b/ci-fixtures/tools/minecraft-source-compatibility.json @@ -1,7 +1,7 @@ { "schema": 1, "targets": { - "net.minecraftforge:forge:1.20.6-50.2.0": { + "net.minecraftforge:forge:1.21.1-52.1.0": { "expectedApplications": 0, "rules": [] } diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index 6d78146d9..a602dbacc 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -6,16 +6,21 @@ plates, rods, gears, casings, dense plates, crushed and purified ores, crystals, shards, clumps, dirty dusts, and molten fluids. Adamantite, Adamantium, Adamant, Quicksilver, and steel-sprocket names are -forwarding tags. Copper-consuming recipes accept `forge:ingots/copper`, except -Base Metals' own compacting and decompacting recipes, whose unambiguous output -must remain the Base Metals item. Copper ore and storage tags contain both -vanilla and Base Metals entries; Base Metals copper ore smelts to the Base -Metals ingot. +forwarding tags. Copper-consuming recipes accept `forge:ingots/copper`. +Copper ingots, storage blocks, doors, trapdoors, slabs and stairs use their +vanilla equivalents as new recipe outputs. The old Base Metals IDs remain +registered; their ingredient tags include both versions. Copper ore and powders +smelt to vanilla copper ingots. Existing copper equipment remains usable. + +Vanilla copper trapdoors cost three ingots each, while the old Base Metals +trapdoors cost four. Their separate recycling recipes return those respective +amounts, so the new recipes cannot turn three ingots into four. Other retained +recycling recipes also accept the appropriate vanilla equivalent. The tags and existing integration data for Mekanism, Thermal, Tinkers' Construct -and Ender IO remain available for future compatibility work. None currently -has a published Forge 1.20.6 build, so their Java API hooks and runtime jars -are not included in this port. Do not substitute jars made for 1.20.1 or NeoForge. +and Ender IO remain available for future compatibility work. Their Java API hooks +and runtime jars are not included in this Forge 1.21.1 port. Do not substitute +jars made for older Minecraft versions or NeoForge. Other processors can use the shared Forge tags without a direct Java integration. diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index 58e5cf230..5d12b5b0b 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -2,7 +2,7 @@ Always upgrade a copy and retain the original legacy world. Install Base Metals 3.1.0 and OreSpawn 4.1.0, but do not carry MMDLib, Additional Loot Tables, the -OreSpawn 3 plugin, or the old native fallback generator into the 1.20.6 instance. +OreSpawn 3 plugin, or the old native fallback generator into the 1.21.1 instance. Minecraft's data fixer cannot identify third-party numeric block IDs from before the 1.13 flattening. Base Metals snapshots those positions, runs @@ -88,7 +88,7 @@ The mode is a server or modpack setting, not a setting stored in each world. ## Moving from 1.20.1 -Minecraft 1.20.6 stores item properties as components rather than the older item +Minecraft 1.21.1 stores item properties as components rather than the older item tag. Base Metals keeps names, enchantments, durability and custom data during that conversion. Saved arrows and bolts also retain their ammunition. @@ -112,3 +112,19 @@ dimensions, and heights. The generated manifests at `data/basemetals/registry_manifest_1_12.json` and `data/basemetals/registry_manifest.json` document the runtime baseline, restored content, and explicit 1.18 additions. + +## Existing modern worlds + +Modern worlds do not need the old numeric-ID conversion. Base Metals only runs +it after confirming an older source save. A leftover `level.dat_old` does not +replace the current player or turn on legacy terrain protection. + +For a genuine upgrade, the original single-player record is captured before +Minecraft reads it. The world-local migration sidecar keeps the source version +and saved registry map for reloads and chunks opened later; it does not store +a player record. A saved registry map from an earlier upgrade takes precedence +over an older backup. + +Chunk reading uses Minecraft's supported region formats. Empty region files +are left alone, and backups include external chunk files when their region +needs conversion. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index a83f07380..06049ee31 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -1,16 +1,16 @@ # Supported versions -Base Metals `3.1.0.120061` targets Minecraft 1.20.6, Forge 50.2.0 and Java 21. -OreSpawn `4.1.0.120061` is the exact build and test dependency. Clients and -servers need OreSpawn `[4.1.0.120061,5.0.0)`. +Base Metals `3.1.1.121011` targets Minecraft 1.21.1, Forge 52.1.0 and Java 21. +OreSpawn `4.1.0.121011` is the exact build and test dependency. Clients and +servers need OreSpawn `[4.1.0.121011,5.0.0)`. -The pinned CurseForge artifact is project 245586, file 9183384: -`curse.maven:mmd-orespawn-245586:9183384`. +The pinned CurseForge artifact is project 245586, file 9189594: +`curse.maven:mmd-orespawn-245586:9189594`. Its SHA-256 is -`FAA7107B9FB84E2C62ED847CAFD880AA3C4238A37799BAD955EA9602A944AA26`. +`EB369B7D7CE6D6C453658347A420C2F0783B7F4D1AC7383C87176AC05192B5A0`. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.0.120061`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121011`. The provider remains schema 3, revision 1. OreSpawn 4.1 is needed for the configuration-screen API; the provider's eleven rule IDs and 1.18 distributions diff --git a/docs/WORLDGEN.md b/docs/WORLDGEN.md index aaf314dcf..e743dd03c 100644 --- a/docs/WORLDGEN.md +++ b/docs/WORLDGEN.md @@ -1,8 +1,8 @@ # OreSpawn world generation -Base Metals requires OreSpawn `[4.1.0.120061,5.0.0)` and packages provider schema 3, +Base Metals requires OreSpawn `[4.1.0.121011,5.0.0)` and packages provider schema 3, revision 1 at `data/basemetals/orespawn/provider.json`. Builds and tests use the -published OreSpawn `4.1.0.120061` release. The provider is checked against the +published OreSpawn `4.1.0.121011` release. The provider is checked against the included 4.1.0 schema. The provider declares ores only: it has no rocks, geomes, biome rules, terrain diff --git a/docs/schemas/orespawn-4.1.0/README.md b/docs/schemas/orespawn-4.1.0/README.md index 795354994..05b3e92d9 100644 --- a/docs/schemas/orespawn-4.1.0/README.md +++ b/docs/schemas/orespawn-4.1.0/README.md @@ -1,9 +1,9 @@ # OreSpawn 4.1.0 schemas -These public schemas match OreSpawn 4.1.0.120061. The Base Metals provider +These public schemas match OreSpawn 4.1.0.121011. The Base Metals provider still uses schema 3 and revision 1; its ore rules have not changed. The build validates the provider against this snapshot. OreSpawn 4.1 is also needed for the Base Metals configuration button in its world-creation screen. -Source: [OreSpawn 4.1.0.120061](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.120061). +Source: [OreSpawn 4.1.0.121011](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.121011). diff --git a/gradle.properties b/gradle.properties index 302aa7bdc..fd47631bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,14 +11,14 @@ net.minecraftforge.gradle.merge-source-sets=false ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.20.6 +minecraft_version=1.21.1 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.6,1.21) +minecraft_version_range=[1.21.1,1.21.2) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=50.2.0 -forge_installer_sha256=8789098B077F5486449311A11DC05E977FEB9430913CB15F30B21A2D8AA213EA +forge_version=52.1.0 +forge_installer_sha256=F1B620F2879AD6A5BBE15DABA4D8F81EAB9F5E08004967604960B98996BDEBC4 # Release metadata consumed by the generic dispatcher. loader_name=forge loader_code=1 @@ -29,14 +29,14 @@ curseforge_project_id=240967 # Exact released OreSpawn used for development and qualification. Runtime # metadata intentionally remains compatible with supported OreSpawn 4 builds. -orespawn_version=4.1.0.120061 +orespawn_version=4.1.0.121011 orespawn_curse_project_id=245586 -orespawn_curse_file_id=9183384 -orespawn_sha256=FAA7107B9FB84E2C62ED847CAFD880AA3C4238A37799BAD955EA9602A944AA26 +orespawn_curse_file_id=9189594 +orespawn_sha256=EB369B7D7CE6D6C453658347A420C2F0783B7F4D1AC7383C87176AC05192B5A0 # The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[50,) +forge_version_range=[52.1.0,53) # The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[50,) +loader_version_range=[52,53) # The mapping channel to use for mappings. # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. @@ -54,7 +54,7 @@ loader_version_range=[50,) mapping_channel=official # The mapping version to query from the mapping channel. # This must match the format required by the mapping channel. -mapping_version=1.20.6 +mapping_version=1.21.1 ## Mod Properties @@ -67,7 +67,7 @@ mod_name=Base Metals # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=LGPL-2.1 # The mod version. See https://semver.org/ -mod_version=3.1.0.120061 +mod_version=3.1.1.121011 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html @@ -77,7 +77,7 @@ mod_authors=Cyanobacterium, jriwanek, dshadowwolf, GetDizzy611, SkyBlade1978, th # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. mod_description=Adds historically common metals, fantasy metals, alloys, tools, armour, and OreSpawn-powered deposits. -# Forge 50 uses official runtime names. +# Forge 52 uses official runtime names. reobf=false -mcp_version=20240429.135109 +mcp_version=20240808.132146 java_setup_version=21.0.7+6.0.LTS diff --git a/gradle/README.md b/gradle/README.md index 9b7232a5d..55a9ecc5a 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -30,8 +30,8 @@ flower, sapling and leaf tags include suitable new plants. Normal client and server launches load only Base Metals and OreSpawn. The optional-mod profile has its own run folder, but no optional integration mods -are pinned for Forge 1.20.6. Mekanism, Tinkers, Thermal and Ender IO have no -compatible releases for this target; their dormant data remains available for +are pinned for Forge 1.21.1. The Mekanism, Tinkers, Thermal and Ender IO Java +integrations are not enabled here; their dormant data remains available for future integration work. Run `prepareEclipse` after importing the project or refreshing Gradle. It diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ad567e737..fa94d843d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -54,12 +54,12 @@ dependencies { implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}") // OreSpawn remains an ordinary hard mod dependency in metadata and is - // never shaded into Base Metals. Use the published 1.20.6 release in + // never shaded into Base Metals. Use the published 1.21.1 release in // development so clean checkouts exercise the same artifact as players. implementation "curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}" orespawnRelease "curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}" - // No optional integrations currently publish Forge 1.20.6 builds. + // Optional Java integrations are not enabled in this Forge 1.21.1 port. testImplementation platform('org.junit:junit-bom:5.10.2') testImplementation 'org.junit.jupiter:junit-jupiter' testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2' diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle index 1b0e1af20..581d83fb9 100644 --- a/gradle/ide/eclipse.gradle +++ b/gradle/ide/eclipse.gradle @@ -73,14 +73,14 @@ def verifyDevelopmentRunProfiles = tasks.register('verifyDevelopmentRunProfiles' || optionalDevelopmentArtifacts.any { expected -> !optionalClient.classpath.files.any { it.name.contains("${expected.module}-${expected.file}") } }) { - throw new GradleException('The optional client must load the pinned 1.20.6 dependencies') + throw new GradleException('The optional client must load the pinned 1.21.1 dependencies') } } } -def syncForge50EclipseLaunches = tasks.register('syncForge50EclipseLaunches') { +def syncForgeEclipseLaunches = tasks.register('syncForgeEclipseLaunches') { group = 'ide' - description = 'Normalizes Forge 50 Eclipse launches to the production-only merged output.' + description = 'Normalizes Forge Eclipse launches to the production-only merged output.' dependsOn tasks.named('classes') doLast { String mainOutput = new File(projectDir, 'bin/main').absolutePath @@ -221,7 +221,7 @@ def syncForge50EclipseLaunches = tasks.register('syncForge50EclipseLaunches') { def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionClasspath') { group = 'verification' description = 'Verifies Eclipse client/server launches cannot see validation-only code.' - dependsOn syncForge50EclipseLaunches + dependsOn syncForgeEclipseLaunches dependsOn verifyDevelopmentRunProfiles doLast { File classpath = file('.classpath') @@ -297,7 +297,7 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } String expectedModClasses = "${mod_id}%%${new File(projectDir, 'bin/main').absolutePath}" if (!launch.contains(expectedModClasses)) { - throw new GradleException("Eclipse launch is not using Forge 50's merged production output: ${name}") + throw new GradleException("Eclipse launch is not using Forge's merged production output: ${name}") } ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> if (launch.contains("--${flag} ") && !launch.contains("--${flag} "")) { @@ -308,7 +308,7 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } File processed = layout.buildDirectory.dir('resources/main').get().asFile ['META-INF/mods.toml', 'data/basemetals/orespawn/provider.json', - 'data/basemetals/recipes/stone_crackhammer.json'].each { name -> + 'data/basemetals/recipe/stone_crackhammer.json'].each { name -> File expected = new File(processed, name) File actual = new File(projectDir, "bin/main/${name}") if (!expected.isFile() || !actual.isFile() @@ -317,28 +317,28 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } } String metadata = new File(projectDir, 'bin/main/META-INF/mods.toml').getText('UTF-8') - if (metadata.contains('${') || !metadata.contains('version="3.1.0.120061"')) { + if (metadata.contains('${') || !metadata.contains('version="3.1.1.121011"')) { throw new GradleException('Eclipse output contains unresolved or invalid Base Metals version metadata') } } } verifyDevelopmentRunProfiles.configure { - dependsOn syncForge50EclipseLaunches + dependsOn syncForgeEclipseLaunches } tasks.matching { it.name == 'genEclipseRuns' }.configureEach { - finalizedBy syncForge50EclipseLaunches + finalizedBy syncForgeEclipseLaunches } tasks.register('isolateEclipseProductionRuns') { group = 'ide' dependsOn tasks.named('genEclipseRuns') - dependsOn syncForge50EclipseLaunches + dependsOn syncForgeEclipseLaunches } tasks.matching { it.name == 'eclipse' }.configureEach { - finalizedBy syncForge50EclipseLaunches + finalizedBy syncForgeEclipseLaunches } // Use this after import or refresh to regenerate and check the ordinary launches. diff --git a/gradle/release/artifacts.gradle b/gradle/release/artifacts.gradle index 8af325a0a..70e124417 100644 --- a/gradle/release/artifacts.gradle +++ b/gradle/release/artifacts.gradle @@ -183,7 +183,7 @@ tasks.register('verifyMavenCoordinates') { tasks.register('verifyMavenizerCompatibilityFixture') { group = 'verification' - description = 'Verifies the checksum-sealed Forge 1.20.6 Mavenizer compatibility fixture.' + description = 'Verifies the checksum-sealed Forge 1.21.1 Mavenizer compatibility fixture.' inputs.file project.ext.mavenizerCompatibilityJar doLast { File fixture = project.ext.mavenizerCompatibilityJar.asFile @@ -197,23 +197,23 @@ tasks.register('verifyMavenizerCompatibilityFixture') { tasks.register('verifyReleaseConfiguration') { group = 'verification' - description = 'Verifies the exact Base Metals 1.20.6 release identity.' + description = 'Verifies the exact Base Metals 1.21.1 release identity.' dependsOn tasks.named('verifyMavenizerCompatibilityFixture') dependsOn tasks.named('verifyJava21Toolchain') doLast { - if (configuredReleaseIdentity.modVersion != '3.1.0.120061' + if (configuredReleaseIdentity.modVersion != '3.1.1.121011' || configuredReleaseIdentity.modGroup != expectedMavenGroup - || configuredReleaseIdentity.minecraftVersion != '1.20.6' - || configuredReleaseIdentity.forgeVersion != '50.2.0' - || configuredReleaseIdentity.forgeInstallerSha256 != '8789098B077F5486449311A11DC05E977FEB9430913CB15F30B21A2D8AA213EA' + || configuredReleaseIdentity.minecraftVersion != '1.21.1' + || configuredReleaseIdentity.forgeVersion != '52.1.0' + || configuredReleaseIdentity.forgeInstallerSha256 != 'F1B620F2879AD6A5BBE15DABA4D8F81EAB9F5E08004967604960B98996BDEBC4' || configuredReleaseIdentity.mappingChannel != 'official' - || configuredReleaseIdentity.mappingVersion != '1.20.6' + || configuredReleaseIdentity.mappingVersion != '1.21.1' || configuredReleaseIdentity.loaderName != 'forge' || configuredReleaseIdentity.loaderCode != '1' || configuredReleaseIdentity.javaVersion != '21' || configuredReleaseIdentity.gradleJavaVersion != '21' || configuredReleaseIdentity.curseForgeProjectId != '240967') { - throw new GradleException('Unexpected Base Metals 1.20.6 release identity') + throw new GradleException('Unexpected Base Metals 1.21.1 release identity') } } } @@ -222,10 +222,10 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn qualification dependency.' doLast { - if (configuredOreSpawnIdentity.version != '4.1.0.120061' + if (configuredOreSpawnIdentity.version != '4.1.0.121011' || configuredOreSpawnIdentity.curseProjectId != '245586' - || configuredOreSpawnIdentity.curseFileId != '9183384' - || configuredOreSpawnIdentity.sha256 != 'FAA7107B9FB84E2C62ED847CAFD880AA3C4238A37799BAD955EA9602A944AA26') { + || configuredOreSpawnIdentity.curseFileId != '9189594' + || configuredOreSpawnIdentity.sha256 != 'EB369B7D7CE6D6C453658347A420C2F0783B7F4D1AC7383C87176AC05192B5A0') { throw new GradleException('Unexpected OreSpawn release coordinates') } File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts @@ -302,7 +302,7 @@ tasks.register('verifyReleaseArtifacts') { 'META-INF/MANIFEST.MF', 'pack.mcmeta', 'data/basemetals/orespawn/provider.json', - 'data/basemetals/recipes/stone_crackhammer.json', + 'data/basemetals/recipe/stone_crackhammer.json', 'data/forge/loot_modifiers/global_loot_modifiers.json', 'assets/basemetals/lang/en_us.json', 'META-INF/basemetals/docs/VERSIONS.md', @@ -314,14 +314,14 @@ tasks.register('verifyReleaseArtifacts') { if (manifest.mainAttributes.getValue('Maven-Artifact') != expectedMavenCoordinate) { throw new GradleException('Release manifest contains the wrong Maven coordinate') } - String expectedBuildTarget = 'minecraft-1.20.6-forge-50.2.0-java-21' + String expectedBuildTarget = 'minecraft-1.21.1-forge-52.1.0-java-21' if (manifest.mainAttributes.getValue('Build-Target') != expectedBuildTarget) { throw new GradleException('Release manifest contains the wrong stable build target') } String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') if (modsToml.contains('${') - || !modsToml.contains('version="3.1.0.120061"') - || !modsToml.contains('versionRange="[4.1.0.120061,5.0.0)"')) { + || !modsToml.contains('version="3.1.1.121011"') + || !modsToml.contains('versionRange="[4.1.0.121011,5.0.0)"')) { throw new GradleException('Release mods.toml contains unresolved or incompatible metadata') } def provider = new JsonSlurper().parse(zip.getInputStream( diff --git a/gradle/verification/packaged-runtime.gradle b/gradle/verification/packaged-runtime.gradle index 95288af53..1add56d10 100644 --- a/gradle/verification/packaged-runtime.gradle +++ b/gradle/verification/packaged-runtime.gradle @@ -19,7 +19,7 @@ def packagedClientRunDirectory = layout.buildDirectory.dir('packaged-client-run' def requireRuntimeDirectory = { Provider configuredPath, String propertyName -> if (!configuredPath.isPresent()) { - throw new GradleException("Pass -P${propertyName}=") + throw new GradleException("Pass -P${propertyName}=") } File runtime = file(configuredPath.get()) if (!runtime.isDirectory()) throw new GradleException("${propertyName} does not name a directory: ${runtime}") @@ -84,8 +84,8 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex doFirst { File runtime = requireRuntimeDirectory(packagedForgeServerRuntime, 'packagedForgeServerRuntime') File libraries = new File(runtime, 'libraries') - File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.20.6-50.2.0') - File launcher = new File(forgeDirectory, 'forge-1.20.6-50.2.0-server.jar') + File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.21.1-52.1.0') + File launcher = new File(forgeDirectory, 'forge-1.21.1-52.1.0-server.jar') File sourceArguments = new File(forgeDirectory, System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows') ? 'win_args.txt' : 'unix_args.txt') @@ -124,9 +124,9 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex if (!marker.isFile()) throw new GradleException('Packaged dedicated-server completion marker is missing') Properties values = new Properties() marker.withInputStream { values.load(it) } - if (values.getProperty('basemetals') != '3.1.0.120061' - || values.getProperty('orespawn') != '4.1.0.120061' - || values.getProperty('forge') != '50.2.0') { + if (values.getProperty('basemetals') != '3.1.1.121011' + || values.getProperty('orespawn') != '4.1.0.121011' + || values.getProperty('forge') != '52.1.0') { throw new GradleException("Packaged dedicated-server versions are wrong: ${values}") } verifyPackagedLog(runDirectory, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', @@ -168,7 +168,7 @@ def preparePackagedClientSmoke = tasks.register('preparePackagedClientSmoke') { File hostPack = new File(runDirectory, 'resourcepacks/basemetals-host-test') File texture = new File(hostPack, 'assets/minecraft/textures/block/stone.png') texture.parentFile.mkdirs() - new java.util.zip.ZipFile(new File(runtime, 'versions/1.20.6/1.20.6.jar')).withCloseable { zip -> + new java.util.zip.ZipFile(new File(runtime, 'versions/1.21.1/1.21.1.jar')).withCloseable { zip -> texture.bytes = zip.getInputStream(zip.getEntry('assets/minecraft/textures/block/dirt.png')).bytes } new File(hostPack, 'pack.mcmeta').setText( @@ -192,13 +192,13 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex dependsOn preparePackagedClientSmoke doFirst { File runtime = requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime') - String forgeVersionId = ['1.20.6-forge-50.2.0', 'forge-50.2.0'].find { candidate -> + String forgeVersionId = ['1.21.1-forge-52.1.0', 'forge-52.1.0'].find { candidate -> new File(runtime, "versions/${candidate}/${candidate}.json").isFile() } - if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 50.2.0 profile') + if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 52.1.0 profile') File forgeJsonFile = new File(runtime, "versions/${forgeVersionId}/${forgeVersionId}.json") - File baseJsonFile = new File(runtime, 'versions/1.20.6/1.20.6.json') - File baseJar = new File(runtime, 'versions/1.20.6/1.20.6.jar') + File baseJsonFile = new File(runtime, 'versions/1.21.1/1.21.1.json') + File baseJar = new File(runtime, 'versions/1.21.1/1.21.1.jar') File nativesDirectory = new File(runtime, "natives/${forgeVersionId}") [forgeJsonFile, baseJsonFile, baseJar, new File(runtime, 'libraries'), new File(runtime, 'assets'), nativesDirectory].each { diff --git a/gradle/verification/support.gradle b/gradle/verification/support.gradle index 85b8331da..f9ddd9783 100644 --- a/gradle/verification/support.gradle +++ b/gradle/verification/support.gradle @@ -119,12 +119,12 @@ def prepareGameTestStructures = tasks.register('prepareGameTestStructures') { description = 'Creates the empty structure used by the isolated GameTests.' outputs.dir gameTestResources doLast { - File structure = new File(gameTestResources.get().asFile, 'data/basemetals/structures/empty.nbt') + File structure = new File(gameTestResources.get().asFile, 'data/basemetals/structure/empty.nbt') structure.parentFile.mkdirs() structure.withOutputStream { fileStream -> new DataOutputStream(new java.util.zip.GZIPOutputStream(fileStream)).withCloseable { nbt -> nbt.writeByte(10); nbt.writeUTF('') - nbt.writeByte(3); nbt.writeUTF('DataVersion'); nbt.writeInt(3839) + nbt.writeByte(3); nbt.writeUTF('DataVersion'); nbt.writeInt(3955) nbt.writeByte(9); nbt.writeUTF('size'); nbt.writeByte(3); nbt.writeInt(3) [3, 3, 3].each { nbt.writeInt(it) } nbt.writeByte(9); nbt.writeUTF('palette'); nbt.writeByte(10); nbt.writeInt(1) @@ -163,7 +163,7 @@ tasks.matching { it.name == 'runGameTestServer' }.configureEach { doLast { File log = layout.projectDirectory.file('run-gametest/logs/latest.log').asFile String text = log.isFile() ? log.getText('UTF-8') : '' - if (!(text =~ /All [1-9][0-9]* required tests passed/).find()) { + if (!(text =~ /All 43 required tests passed/).find()) { throw new GradleException('GameTests did not report a completed, passing suite. See run-gametest/logs/latest.log.') } if (text =~ /(?i)(ERROR|FATAL)\]/) { diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java index ccbad7ce2..b3c145130 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java @@ -216,7 +216,7 @@ protected void registerModels() { } ModContent.fluids().forEach((name, fluid) -> getBuilder(name + "_bucket") - .parent(getExistingFile(new net.minecraft.resources.ResourceLocation("forge", "item/bucket"))) + .parent(getExistingFile(net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("forge", "item/bucket"))) .customLoader(DynamicFluidContainerModelBuilder::begin) .fluid(fluid.source().get())); diff --git a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java index e6442e77d..7191e70c6 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java @@ -18,6 +18,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.compat.VanillaCopper; import zone.moddev.mc.basemetals.content.ModContent; import zone.moddev.mc.basemetals.material.MaterialCatalogue; import zone.moddev.mc.basemetals.material.MaterialDefinition; @@ -26,6 +27,16 @@ import net.minecraft.data.DataProvider; import net.minecraft.data.CachedOutput; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.BowItem; +import net.minecraft.world.item.DiggerItem; +import net.minecraft.world.item.FishingRodItem; +import net.minecraft.world.item.HoeItem; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.item.ShearsItem; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.SwordItem; /** Small catalogue-driven generator for server data and compatibility manifests. */ final class GeneratedData implements DataProvider { @@ -147,7 +158,7 @@ private void writeLoot(CachedOutput cache) throws IOException { pool.add("conditions", conditions); JsonObject root = object("type", "minecraft:block"); JsonArray pools = new JsonArray(); pools.add(pool); root.add("pools", pools); - save(cache, root, "data/basemetals/loot_tables/blocks/" + id + ".json"); + save(cache, root, "data/basemetals/loot_table/blocks/" + id + ".json"); } } @@ -156,21 +167,21 @@ private void writeTags(CachedOutput cache) throws IOException { for (String id : ModContent.blocksById().keySet()) { if (!ModContent.fluids().containsKey(id)) allBlockDrops.add("basemetals:" + id); } - tag(cache, "minecraft", "blocks/mineable/pickaxe", allBlockDrops); + tag(cache, "minecraft", "block/mineable/pickaxe", allBlockDrops); List beaconBases = MaterialCatalogue.ALL.stream() .filter(MaterialDefinition::hasEquipment) .map(material -> "basemetals:" + material.name() + "_block") .collect(java.util.stream.Collectors.toCollection(ArrayList::new)); beaconBases.add("basemetals:charcoal_block"); - tag(cache, "minecraft", "blocks/beacon_base_blocks", beaconBases); + tag(cache, "minecraft", "block/beacon_base_blocks", beaconBases); // AnvilBlock.damage is hard-coded to the three vanilla blocks in 1.18. // Tagging a custom anvil makes any damaging fall delete it immediately. // BaseMetalAnvilBlock supplies the menu and durability handling itself. - tag(cache, "basemetals", "blocks/crackhammer_crushable", crackhammerCrushableBlocks()); + tag(cache, "basemetals", "block/crackhammer_crushable", crackhammerCrushableBlocks()); writeHarvestTierTags(cache); - tag(cache, "forge", "blocks/netherrack", List.of("minecraft:netherrack")); - tag(cache, "forge", "blocks/end_stones", List.of("minecraft:end_stone")); - tag(cache, "minecraft", "items/arrows", java.util.stream.Stream.concat( + tag(cache, "forge", "block/netherrack", List.of("minecraft:netherrack")); + tag(cache, "forge", "block/end_stones", List.of("minecraft:end_stone")); + tag(cache, "minecraft", "item/arrows", java.util.stream.Stream.concat( MaterialCatalogue.ALL.stream().filter(MaterialDefinition::hasEquipment) .map(material -> "basemetals:" + material.name() + "_arrow"), List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz").stream() @@ -242,21 +253,68 @@ private void writeTags(CachedOutput cache) throws IOException { for (String name : List.of("diamond", "emerald", "gold", "iron")) { addAggregate(aggregateItems, "plates", "#forge:plates/" + name); } - aggregateItems.forEach((path, values) -> uncheckedTag(cache, "forge", "items/" + path, values)); - aggregateBlocks.forEach((path, values) -> uncheckedTag(cache, "forge", "blocks/" + path, values)); + aggregateItems.forEach((path, values) -> uncheckedTag(cache, "forge", "item/" + path, values)); + aggregateBlocks.forEach((path, values) -> uncheckedTag(cache, "forge", "block/" + path, values)); for (String alias : List.of("adamant", "adamantite", "adamantium")) { - tag(cache, "forge", "items/ingots/" + alias, List.of("#forge:ingots/adamantine")); - tag(cache, "forge", "items/nuggets/" + alias, List.of("#forge:nuggets/adamantine")); - tag(cache, "forge", "items/dusts/" + alias, List.of("#forge:dusts/adamantine")); - } - tag(cache, "forge", "items/ingots/quicksilver", List.of("#forge:ingots/mercury")); - tag(cache, "forge", "items/gears/steel", List.of("basemetals:steel_gear")); - tag(cache, "forge", "items/sprockets/steel", List.of("#forge:gears/steel")); - tag(cache, "forge", "items/plates/diamond", List.of()); - tag(cache, "forge", "items/plates/emerald", List.of()); + tag(cache, "forge", "item/ingots/" + alias, List.of("#forge:ingots/adamantine")); + tag(cache, "forge", "item/nuggets/" + alias, List.of("#forge:nuggets/adamantine")); + tag(cache, "forge", "item/dusts/" + alias, List.of("#forge:dusts/adamantine")); + } + tag(cache, "forge", "item/ingots/quicksilver", List.of("#forge:ingots/mercury")); + tag(cache, "forge", "item/gears/steel", List.of("basemetals:steel_gear")); + tag(cache, "forge", "item/sprockets/steel", List.of("#forge:gears/steel")); + tag(cache, "forge", "item/plates/diamond", List.of()); + tag(cache, "forge", "item/plates/emerald", List.of()); writeVanillaBitsTags(cache); writeCompatibilityTags(cache); + writeEnchantmentTags(cache); + } + + private void writeEnchantmentTags(CachedOutput cache) throws IOException { + Map> families = new LinkedHashMap<>(); + + ModContent.itemsById().forEach((id, registered) -> { + var item = registered.get(); + String name = "basemetals:" + id; + + if (item instanceof SwordItem) addAggregate(families, "swords", name); + if (item instanceof AxeItem) addAggregate(families, "axes", name); + if (item instanceof PickaxeItem) addAggregate(families, "pickaxes", name); + if (item instanceof ShovelItem) addAggregate(families, "shovels", name); + if (item instanceof HoeItem) addAggregate(families, "hoes", name); + + if (item instanceof DiggerItem) { + addAggregate(families, "enchantable/mining", name); + addAggregate(families, "enchantable/mining_loot", name); + } else if (item instanceof ShearsItem) { + addAggregate(families, "enchantable/mining", name); + } + + if (item instanceof BowItem) { + // Our crossbows still draw and fire like bows, including their enchantments. + addAggregate(families, "enchantable/bow", name); + } + if (item instanceof FishingRodItem) addAggregate(families, "enchantable/fishing", name); + if (item.getDefaultInstance().isDamageableItem()) addAggregate(families, "enchantable/durability", name); + + if (item instanceof ArmorItem armor) { + String family = switch (armor.getType()) { + case HELMET -> "head_armor"; + case CHESTPLATE -> "chest_armor"; + case LEGGINGS -> "leg_armor"; + case BOOTS -> "foot_armor"; + default -> null; + }; + if (family != null) addAggregate(families, family, name); + } + }); + + for (var entry : families.entrySet()) { + tag(cache, "minecraft", "item/" + entry.getKey(), entry.getValue().stream().sorted().toList()); + } + + tag(cache, "minecraft", "entity_type/arrows", List.of("basemetals:custom_arrow", "basemetals:custom_bolt")); } private void writeVanillaBitsTags(CachedOutput cache) throws IOException { @@ -270,52 +328,52 @@ private void writeVanillaBitsTags(CachedOutput cache) throws IOException { "quartz", "minecraft:quartz_block", "obsidian", "minecraft:obsidian"); for (String material : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { if (ModContent.itemsById().containsKey(material + "_rod")) { - tag(cache, "forge", "items/rods/" + material, + tag(cache, "forge", "item/rods/" + material, List.of("basemetals:" + material + "_rod")); } if (ModContent.itemsById().containsKey(material + "_gear")) { - tag(cache, "forge", "items/gears/" + material, + tag(cache, "forge", "item/gears/" + material, List.of("basemetals:" + material + "_gear")); } - tag(cache, "forge", "items/materials/" + material, + tag(cache, "forge", "item/materials/" + material, List.of(vanillaIngot.get(material))); - tag(cache, "forge", "items/storage_blocks/" + material, + tag(cache, "forge", "item/storage_blocks/" + material, List.of(vanillaBlock.get(material))); - tag(cache, "forge", "blocks/storage_blocks/" + material, + tag(cache, "forge", "block/storage_blocks/" + material, List.of(vanillaBlock.get(material))); } - tag(cache, "forge", "items/rods/stone", List.of("basemetals:stone_rod")); + tag(cache, "forge", "item/rods/stone", List.of("basemetals:stone_rod")); for (String material : List.of("wood", "stone")) { - tag(cache, "forge", "items/gears/" + material, + tag(cache, "forge", "item/gears/" + material, List.of("basemetals:" + material + "_gear")); } for (String material : List.of("coal", "charcoal", "diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { - tag(cache, "forge", "items/dusts/" + material, + tag(cache, "forge", "item/dusts/" + material, List.of("basemetals:" + material + "_powder")); - tag(cache, "forge", "items/tiny_dusts/" + material, + tag(cache, "forge", "item/tiny_dusts/" + material, List.of("basemetals:" + material + "_smallpowder")); } - tag(cache, "forge", "items/tiny_dusts/redstone", List.of("basemetals:redstone_smallpowder")); - tag(cache, "forge", "items/tiny_dusts/lapis", List.of("basemetals:lapis_smallpowder")); - tag(cache, "forge", "items/dusts/redstone", List.of("minecraft:redstone")); - tag(cache, "forge", "items/dusts/lapis", List.of("minecraft:lapis_lazuli")); - tag(cache, "forge", "items/dusts/prismarine", List.of("minecraft:prismarine_shard")); + tag(cache, "forge", "item/tiny_dusts/redstone", List.of("basemetals:redstone_smallpowder")); + tag(cache, "forge", "item/tiny_dusts/lapis", List.of("basemetals:lapis_smallpowder")); + tag(cache, "forge", "item/dusts/redstone", List.of("minecraft:redstone")); + tag(cache, "forge", "item/dusts/lapis", List.of("minecraft:lapis_lazuli")); + tag(cache, "forge", "item/dusts/prismarine", List.of("minecraft:prismarine_shard")); for (String material : List.of("coal", "charcoal", "diamond", "emerald", "obsidian", "quartz")) { - tag(cache, "forge", "items/nuggets/" + material, + tag(cache, "forge", "item/nuggets/" + material, List.of("basemetals:" + material + "_nugget")); } - tag(cache, "forge", "items/ingots/obsidian", List.of("basemetals:obsidian_ingot")); - tag(cache, "forge", "items/ingots/redstone", List.of("basemetals:redstone_ingot")); - tag(cache, "forge", "items/plates/gold", List.of("basemetals:gold_plate")); - tag(cache, "forge", "items/plates/iron", List.of("basemetals:iron_plate")); + tag(cache, "forge", "item/ingots/obsidian", List.of("basemetals:obsidian_ingot")); + tag(cache, "forge", "item/ingots/redstone", List.of("basemetals:redstone_ingot")); + tag(cache, "forge", "item/plates/gold", List.of("basemetals:gold_plate")); + tag(cache, "forge", "item/plates/iron", List.of("basemetals:iron_plate")); for (String material : List.of("diamond", "gold", "iron")) { - tag(cache, "forge", "items/blends/" + material, + tag(cache, "forge", "item/blends/" + material, List.of("basemetals:" + material + "_blend")); - tag(cache, "forge", "items/small_blends/" + material, + tag(cache, "forge", "item/small_blends/" + material, List.of("basemetals:" + material + "_smallblend")); } - tag(cache, "forge", "items/storage_blocks/charcoal", List.of("basemetals:charcoal_block")); - tag(cache, "forge", "blocks/storage_blocks/charcoal", List.of("basemetals:charcoal_block")); + tag(cache, "forge", "item/storage_blocks/charcoal", List.of("basemetals:charcoal_block")); + tag(cache, "forge", "block/storage_blocks/charcoal", List.of("basemetals:charcoal_block")); } private static List crackhammerCrushableBlocks() { @@ -371,23 +429,34 @@ private void writeHarvestTierTags(CachedOutput cache) throws IOException { byTier.get(3).add("basemetals:adamantine_anvil"); // The registry-backed maps above do not promise iteration order. Sort // these generated tags so runData is byte-for-byte reproducible. - tag(cache, "minecraft", "blocks/needs_stone_tool", + tag(cache, "minecraft", "block/needs_stone_tool", byTier.get(1).stream().sorted().toList()); - tag(cache, "minecraft", "blocks/needs_iron_tool", + tag(cache, "minecraft", "block/needs_iron_tool", byTier.get(2).stream().sorted().toList()); - tag(cache, "minecraft", "blocks/needs_diamond_tool", + tag(cache, "minecraft", "block/needs_diamond_tool", byTier.get(3).stream().sorted().toList()); } private void writeCompatibilityTags(CachedOutput cache) throws IOException { + for (var entry : VanillaCopper.equivalents().entrySet()) { + if (entry.getKey().endsWith("_ingot") || entry.getKey().endsWith("_block")) continue; + + String tag = VanillaCopper.ingredientTag(entry.getKey()).substring("forge:".length()); + tag(cache, "forge", "item/" + tag, List.of(entry.getKey(), entry.getValue())); + + if (!entry.getKey().endsWith("_ingot")) { + tag(cache, "forge", "block/" + tag, List.of(entry.getKey(), entry.getValue())); + } + } + for (MaterialDefinition material : MaterialCatalogue.ALL) { - tag(cache, "forge", "fluids/molten_" + material.name(), List.of( + tag(cache, "forge", "fluid/molten_" + material.name(), List.of( "basemetals:" + material.name(), "basemetals:flowing_" + material.name())); } for (String material : PROCESSING_MATERIALS) { for (String family : List.of("dirty_dusts", "clumps", "crystals", "shards")) { - tag(cache, "mekanism", "items/" + family + "/" + material, + tag(cache, "mekanism", "item/" + family + "/" + material, List.of("#forge:" + family + "/" + material)); } } @@ -474,6 +543,11 @@ private void writeRecipes(CachedOutput cache) throws IOException { legacySpecialRecipes(cache); anvilRecipes(cache); writeCompatibilityRecipes(cache); + + // Keep the four-ingot refund for old trapdoors. + // Vanilla trapdoors cost only three ingots each. + legacySmelting(cache, "vanilla_copper_trapdoor_recycling", "minecraft:copper_trapdoor", + "minecraft:copper_ingot", 3, MaterialCatalogue.get("copper").oreSmeltingExperience(), 200); } private void equipmentRecipes(CachedOutput cache, String name, String metal) throws IOException { @@ -519,8 +593,8 @@ private void decorativeRecipes(CachedOutput cache, String name, String metal, St shaped(cache, name + "_bars_2", List.of("XXX"), Map.of('X', "#forge:rods/" + name), "basemetals:" + name + "_bars", 4); shaped(cache, name + "_door", List.of("XX", "XX", "XX"), Map.of('X', metal), "basemetals:" + name + "_door", 3); - shaped(cache, name + "_trapdoor", List.of("XX", "XX"), Map.of('X', metal), - "basemetals:" + name + "_trapdoor", 1); + shaped(cache, name + "_trapdoor", name.equals("copper") ? List.of("XXX", "XXX") : List.of("XX", "XX"), + Map.of('X', metal), "basemetals:" + name + "_trapdoor", name.equals("copper") ? 2 : 1); shaped(cache, name + "_button", List.of("X", "X"), Map.of('X', "#forge:nuggets/" + name), "basemetals:" + name + "_button", 1); shaped(cache, name + "_slab", List.of("XXX"), Map.of('X', block), "basemetals:" + name + "_slab", 6); @@ -1307,7 +1381,7 @@ private void saveConditionalRecipe(CachedOutput cache, JsonObject recipe, String outputs.stream().filter(item -> item.startsWith("basemetals:")) .forEach(item -> conditions.add(object("type", "basemetals:content_mode", "item", item))); recipe.add("forge:condition", object("type", "forge:and", "values", conditions)); - save(cache, recipe, "data/basemetals/recipes/" + id + ".json"); + save(cache, recipe, "data/basemetals/recipe/" + id + ".json"); } private static void collectItemOutputs(com.google.gson.JsonElement value, java.util.Set outputs) { @@ -1344,7 +1418,7 @@ private void writeAdvancements(CachedOutput cache) throws IOException { JsonObject criterion = new JsonObject(); criterion.addProperty("trigger", "minecraft:impossible"); JsonObject criteria = new JsonObject(); criteria.add("event", criterion); root.add("criteria", criteria); - save(cache, root, "data/basemetals/advancements/" + id + ".json"); + save(cache, root, "data/basemetals/advancement/" + id + ".json"); } } @@ -1476,7 +1550,7 @@ private void writeChestLoot(CachedOutput cache) throws IOException { modifier.addProperty("table", "basemetals:chests/inject/" + target.getKey()); save(cache, modifier, "data/basemetals/loot_modifiers/" + target.getKey() + ".json"); save(cache, legacyChestTable(templates.get(target.getKey())), - "data/basemetals/loot_tables/chests/inject/" + target.getKey() + ".json"); + "data/basemetals/loot_table/chests/inject/" + target.getKey() + ".json"); } JsonObject root = new JsonObject(); root.addProperty("replace", false); root.add("entries", global); save(cache, root, "data/forge/loot_modifiers/global_loot_modifiers.json"); @@ -1489,6 +1563,7 @@ private JsonObject legacyChestTable(String template) throws IOException { } JsonObject table = JsonParser.parseString(Files.readString(source, StandardCharsets.UTF_8)).getAsJsonObject(); modernizeLootJson(table); + replaceCopperOutputs(table); table.addProperty("type", "minecraft:chest"); return table; } @@ -1538,7 +1613,7 @@ private void writeManifest(CachedOutput cache) throws IOException { JsonObject root = new JsonObject(); root.addProperty("format", 1); - root.addProperty("source", "Base Metals 1.20.6 catalogue"); + root.addProperty("source", "Base Metals 1.21.1 catalogue"); root.add("blocks", array(blocks)); root.add("items", array(items)); root.add("fluids", array(ModContent.fluids().keySet().stream().flatMap(id -> @@ -1573,10 +1648,10 @@ private static List strings(JsonArray values) { } private void itemTag(CachedOutput cache, String family, String material, List values) throws IOException { - tag(cache, "forge", "items/" + family + "/" + material, values); + tag(cache, "forge", "item/" + family + "/" + material, values); } private void blockTag(CachedOutput cache, String family, String material, List values) throws IOException { - tag(cache, "forge", "blocks/" + family + "/" + material, values); + tag(cache, "forge", "block/" + family + "/" + material, values); } private void tag(CachedOutput cache, String namespace, String path, List values) throws IOException { JsonObject root = new JsonObject(); root.addProperty("replace", false); root.add("values", array(values)); @@ -1597,13 +1672,13 @@ private void shaped(CachedOutput cache, String id, List pattern, Map key.add(entry.getKey().toString(), ingredient(entry.getValue()))); root.add("key", key); root.add("result", result(result, count)); - save(cache, root, "data/basemetals/recipes/" + id + ".json"); + save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private void shapeless(CachedOutput cache, String id, List ingredients, String result, int count) throws IOException { JsonObject root = object("type", "minecraft:crafting_shapeless"); JsonArray values = new JsonArray(); ingredients.forEach(value -> values.add(ingredient(value))); root.add("ingredients", values); root.add("result", result(result, count)); - save(cache, root, "data/basemetals/recipes/" + id + ".json"); + save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private void smelting(CachedOutput cache, String id, String input, String result, float xp, int time, String type) throws IOException { @@ -1613,24 +1688,24 @@ private void smelting(CachedOutput cache, String id, String input, String result } JsonObject root = object("type", type, "ingredient", ingredient(input), "result", result, "experience", xp, "cookingtime", time); - save(cache, root, "data/basemetals/recipes/" + id + ".json"); + save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private void legacySmelting(CachedOutput cache, String id, String input, String result, int count, float xp, int time) throws IOException { JsonObject root = object("type", "basemetals:legacy_smelting", "ingredient", ingredient(input), "result", result(result, count), "experience", xp, "cookingtime", time); - save(cache, root, "data/basemetals/recipes/" + id + ".json"); + save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private void crushing(CachedOutput cache, String id, String input, String result, int count) throws IOException { JsonObject root = object("type", "basemetals:crushing", "ingredient", ingredient(input), "result", result(result, count)); - save(cache, root, "data/basemetals/recipes/" + id + ".json"); + save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private void plateRepair(CachedOutput cache, String id, String target, String plate) throws IOException { JsonObject root = object("type", "basemetals:plate_repair", "target", target, "plate", ingredient(plate)); - save(cache, root, "data/basemetals/recipes/" + id + ".json"); + save(cache, root, "data/basemetals/recipe/" + id + ".json"); } private static JsonObject ingredient(String value) { return value.startsWith("#") ? object("tag", value.substring(1)) : object("item", value); @@ -1652,7 +1727,7 @@ private static List entries(String material, String suffix, List } private static String advancementIcon(String id) { return switch (id) { - case "blocktastic" -> "basemetals:copper_block"; + case "blocktastic" -> "minecraft:copper_block"; case "geologist" -> "basemetals:iron_crackhammer"; case "metallurgy" -> "basemetals:bronze_blend"; case "angel_of_death" -> "basemetals:mithril_sword"; @@ -1661,7 +1736,7 @@ private static String advancementIcon(String id) { case "juggernaut" -> "basemetals:adamantine_chestplate"; case "moon_boots" -> "basemetals:starsteel_boots"; default -> id.endsWith("_maker") ? "basemetals:" + id.substring(0, id.length() - 6) + "_blend" - : "basemetals:copper_ingot"; + : "minecraft:copper_ingot"; }; } @@ -1695,9 +1770,22 @@ private static String title(String id) { return result.toString(); } private void save(CachedOutput cache, JsonObject value, String relative) throws IOException { - if (relative.startsWith("data/basemetals/recipes/") && value.has("type") + if (relative.startsWith("data/basemetals/recipe/")) { + for (String field : List.of("result", "results", "output", "outputs")) { + if (value.has(field)) value.add(field, replaceCopperOutputs(value.get(field))); + } + + // Keep the old trapdoor refund limited to old Base Metals trapdoors. + if (!relative.endsWith("/copper_trapdoor_recycling.json")) { + for (String field : List.of("ingredient", "ingredients", "key", "input", "inputs")) { + if (value.has(field)) acceptCopperEquivalents(value.get(field)); + } + } + } + + if (relative.startsWith("data/basemetals/recipe/") && value.has("type") && value.get("type").getAsString().startsWith("minecraft:crafting_")) { - String id = relative.substring("data/basemetals/recipes/".length(), relative.length() - 5); + String id = relative.substring("data/basemetals/recipe/".length(), relative.length() - 5); String result = value.getAsJsonObject("result").get("item").getAsString(); net.minecraft.world.item.Item item = net.minecraftforge.registries.ForgeRegistries.ITEMS .getValue(ResourceLocation.parse(result)); @@ -1711,11 +1799,51 @@ private void save(CachedOutput cache, JsonObject value, String relative) throws writeCraftingUnlock(cache, id, value); value = object("type", "basemetals:content_crafting", "recipe", value); } - if (relative.contains("/recipes/")) normalizeRecipeResults(value); - if (relative.contains("/advancements/") || relative.contains("/loot_tables/")) normalizePredicates(value); + if (relative.contains("/recipe/")) normalizeRecipeResults(value); + if (relative.contains("/advancement/") || relative.contains("/loot_table/")) normalizePredicates(value); pendingWrites.add(DataProvider.saveStable(cache, value, output.resolve(relative))); } + private static JsonElement replaceCopperOutputs(JsonElement value) { + if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isString()) { + return new com.google.gson.JsonPrimitive(VanillaCopper.output(value.getAsString())); + } + + if (value.isJsonArray()) { + JsonArray result = new JsonArray(); + value.getAsJsonArray().forEach(entry -> result.add(replaceCopperOutputs(entry))); + return result; + } + + if (value.isJsonObject()) { + JsonObject object = value.getAsJsonObject(); + for (String key : new ArrayList<>(object.keySet())) { + object.add(key, replaceCopperOutputs(object.get(key))); + } + } + + return value; + } + + private static void acceptCopperEquivalents(JsonElement value) { + if (value.isJsonArray()) { + value.getAsJsonArray().forEach(GeneratedData::acceptCopperEquivalents); + return; + } + if (!value.isJsonObject()) return; + + JsonObject object = value.getAsJsonObject(); + if (object.has("item") && object.get("item").isJsonPrimitive()) { + String tag = VanillaCopper.ingredientTag(object.get("item").getAsString()); + if (tag != null) { + object.remove("item"); + object.addProperty("tag", tag); + } + } + + new ArrayList<>(object.entrySet()).forEach(entry -> acceptCopperEquivalents(entry.getValue())); + } + private static void normalizeRecipeResults(JsonObject json) { if (json.has("recipe") && json.get("recipe").isJsonObject()) { normalizeRecipeResults(json.getAsJsonObject("recipe")); @@ -1741,7 +1869,10 @@ private static void normalizePredicates(JsonElement value) { if (object.has("tag") && !object.has("type")) { object.addProperty("items", "#" + object.remove("tag").getAsString()); } - if (object.has("enchantments")) { + if (object.has("enchantment") && object.has("levels")) { + object.add("enchantments", object.remove("enchantment")); + } + if (object.has("enchantments") && !object.has("levels") && object.get("enchantments").isJsonArray()) { JsonObject predicates = object.has("predicates") ? object.getAsJsonObject("predicates") : new JsonObject(); predicates.add("minecraft:enchantments", object.remove("enchantments")); @@ -1771,7 +1902,7 @@ private void writeOreLoot(CachedOutput cache, String ore) throws IOException { functions.add(object("function", "minecraft:explosion_decay")); JsonObject rawEntry = object("type", "minecraft:item", "name", raw, "functions", functions); JsonArray enchantments = new JsonArray(); - enchantments.add(object("enchantment", "minecraft:silk_touch", "levels", object("min", 1))); + enchantments.add(object("enchantments", "minecraft:silk_touch", "levels", object("min", 1))); JsonArray conditions = new JsonArray(); conditions.add(object("condition", "minecraft:match_tool", "predicate", object("enchantments", enchantments))); JsonArray children = new JsonArray(); @@ -1782,7 +1913,7 @@ private void writeOreLoot(CachedOutput cache, String ore) throws IOException { JsonArray pools = new JsonArray(); pools.add(object("name", "basemetals_" + ore, "rolls", 1, "entries", entries)); save(cache, object("type", "minecraft:block", "pools", pools), - "data/basemetals/loot_tables/blocks/" + ore + ".json"); + "data/basemetals/loot_table/blocks/" + ore + ".json"); } private void writeRawProcessing(CachedOutput cache) throws IOException { @@ -1793,7 +1924,7 @@ private void writeRawProcessing(CachedOutput cache) throws IOException { for (String material : rawMaterials) { boolean vanilla = List.of("iron", "gold", "copper").contains(material); String raw = vanilla ? "minecraft:raw_" + material : "basemetals:" + material + "_raw"; - tag(cache, "forge", "items/raw_materials/" + material, List.of(raw)); + tag(cache, "forge", "item/raw_materials/" + material, List.of(raw)); crushing(cache, material + "_raw_crushing", "#forge:raw_materials/" + material, "basemetals:" + material + "_powder", 1); if (vanilla) continue; @@ -1809,7 +1940,7 @@ private void writeRawProcessing(CachedOutput cache) throws IOException { writeUnlock(cache, id, criteria); } } - tag(cache, "forge", "items/raw_materials", rawMaterials.stream().map(name -> "#forge:raw_materials/" + name).toList()); + tag(cache, "forge", "item/raw_materials", rawMaterials.stream().map(name -> "#forge:raw_materials/" + name).toList()); } private void writeCraftingUnlock(CachedOutput cache, String id, JsonObject recipe) throws IOException { @@ -1855,7 +1986,7 @@ private void writeUnlock(CachedOutput cache, String id, JsonObject criteria) thr requirements.add(array(criteria.keySet())); save(cache, object("parent", "minecraft:recipes/root", "criteria", criteria, "requirements", requirements, "rewards", object("recipes", array("basemetals:" + id))), - "data/basemetals/advancements/recipes/" + id + ".json"); + "data/basemetals/advancement/recipes/" + id + ".json"); } private static JsonObject inventoryCriterion(JsonObject ingredient) { diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java index 8d55beaa5..4a1f20b96 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java @@ -275,13 +275,13 @@ public static void stoneCrackhammerCraftsFromTheLegacyMiddleColumnPattern(GameTe crafting.setItem(7, new ItemStack(Items.STICK)); var recipe = helper.getLevel().getRecipeManager().getRecipeFor( - RecipeType.CRAFTING, crafting, helper.getLevel()); + RecipeType.CRAFTING, crafting.asCraftInput(), helper.getLevel()); require(helper, recipe.isPresent(), "Stone bricks above two sticks matched no crafting recipe"); if (recipe.isEmpty()) return; require(helper, recipe.orElseThrow().id().equals( ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "stone_crackhammer")), "The legacy stone crackhammer pattern matched the wrong recipe"); - ItemStack output = recipe.orElseThrow().value().assemble(crafting, net.minecraft.core.RegistryAccess.EMPTY); + ItemStack output = recipe.orElseThrow().value().assemble(crafting.asCraftInput(), net.minecraft.core.RegistryAccess.EMPTY); require(helper, output.is(ModContent.item("stone_crackhammer").get()), "The legacy middle-column pattern returned the wrong item"); helper.succeed(); @@ -598,7 +598,7 @@ public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper hel CraftingContainer crafting = craftingContainer(2, 1); ItemStack damaged = ModContent.item("adamantine_chestplate").get().getDefaultInstance(); damaged.setDamageValue(20); - damaged.enchant(Enchantments.PROTECTION, 2); + damaged.enchant(enchantment(helper, Enchantments.PROTECTION), 2); damaged.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, net.minecraft.network.chat.Component.literal("Old name")); net.minecraft.world.item.component.CustomData.update(net.minecraft.core.component.DataComponents.CUSTOM_DATA, damaged, tag -> tag.putBoolean("LegacyCustomData", true)); @@ -608,14 +608,14 @@ public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper hel require(helper, recipe.orElseThrow().value() instanceof PlateRepairRecipe, "Plate-repair recipe loaded with the wrong implementation"); if (!(recipe.orElseThrow().value() instanceof PlateRepairRecipe repair)) return; - require(helper, repair.matches(crafting, helper.getLevel()), + require(helper, repair.matches(crafting.asCraftInput(), helper.getLevel()), "Plate-repair recipe rejected a damaged item and matching plate"); - ItemStack output = repair.assemble(crafting, net.minecraft.core.RegistryAccess.EMPTY); + ItemStack output = repair.assemble(crafting.asCraftInput(), net.minecraft.core.RegistryAccess.EMPTY); require(helper, output.is(ModContent.item("adamantine_chestplate").get()), "Plate repair returned the wrong armor item"); require(helper, output.getDamageValue() == 0, "Plate repair did not fully restore durability"); require(helper, EnchantmentHelper.getItemEnchantmentLevel( - Enchantments.PROTECTION, output) == 2, + enchantment(helper, Enchantments.PROTECTION), output) == 2, "Plate repair lost enchantments"); require(helper, output.has(net.minecraft.core.component.DataComponents.CUSTOM_NAME), "Plate repair lost the custom name"); require(helper, output.getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getBoolean("LegacyCustomData"), @@ -628,7 +628,7 @@ public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsItemData(GameTe ServerPlayer player = survivalPlayer(helper); ItemStack shield = ModContent.item("copper_shield").get().getDefaultInstance(); shield.setDamageValue(10); - shield.enchant(Enchantments.UNBREAKING, 2); + shield.enchant(enchantment(helper, Enchantments.UNBREAKING), 2); shield.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, net.minecraft.network.chat.Component.literal("Old shield")); net.minecraft.world.item.component.CustomData.update(net.minecraft.core.component.DataComponents.CUSTOM_DATA, shield, tag -> tag.putBoolean("LegacyCustomData", true)); @@ -641,7 +641,7 @@ public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsItemData(GameTe "Iron Vanilla Bits plate did not upgrade a softer shield"); require(helper, event.getOutput().getDamageValue() == 0, "Shield upgrade did not produce a fresh shield"); - require(helper, EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, + require(helper, EnchantmentHelper.getItemEnchantmentLevel(enchantment(helper, Enchantments.UNBREAKING), event.getOutput()) == 2, "Shield upgrade lost enchantments"); require(helper, event.getOutput().has(net.minecraft.core.component.DataComponents.CUSTOM_NAME), "Shield upgrade lost the custom name"); @@ -675,7 +675,7 @@ public static void bowsAndLegacyCrossbowsUseOnlyTheirOwnAmmunition(GameTestHelpe player.setItemInHand(InteractionHand.MAIN_HAND, weapon); player.getInventory().setItem(1, bolt.copy()); player.startUsingItem(InteractionHand.MAIN_HAND); - crossbow.releaseUsing(weapon, helper.getLevel(), player, crossbow.getUseDuration(weapon) - 20); + crossbow.releaseUsing(weapon, helper.getLevel(), player, crossbow.getUseDuration(weapon, player) - 20); // Assert synchronously: the GameTest harness may purge fast projectiles // after they leave its deliberately tiny empty structure. @@ -731,7 +731,7 @@ public static void armorToolEffectsAndStarsteelRegenerationAreServerAuthoritativ equip(player, "adamantine"); player.tickCount = 20; BaseMetalsEvents events = new BaseMetalsEvents(); - events.onPlayerTick(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player)); + events.onPlayerTick(new TickEvent.PlayerTickEvent.Post(player)); require(helper, player.getEffect(MobEffects.DAMAGE_RESISTANCE) != null && player.getEffect(MobEffects.DAMAGE_RESISTANCE).getAmplifier() == 1, "Four Adamantine pieces did not grant Resistance II"); @@ -745,7 +745,7 @@ public static void armorToolEffectsAndStarsteelRegenerationAreServerAuthoritativ player.setItemInHand(InteractionHand.MAIN_HAND, starsteel); player.setItemInHand(InteractionHand.OFF_HAND, armor); player.tickCount = 200; - events.onPlayerTick(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player)); + events.onPlayerTick(new TickEvent.PlayerTickEvent.Post(player)); require(helper, starsteel.getDamageValue() == 4, "Held Starsteel tool did not regenerate one durability"); require(helper, armor.getDamageValue() == 5, @@ -864,7 +864,7 @@ public static void eventBackedAdvancementsAwardForActualLegacyActions(GameTestHe private static void assertCrushingRecipe(GameTestHelper helper, ItemStack input, String expectedItem, int expectedCount) { var recipe = helper.getLevel().getRecipeManager().getRecipeFor( - CrushingRecipe.TYPE.get(), new SimpleContainer(input), helper.getLevel()); + CrushingRecipe.TYPE.get(), new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isPresent(), "No crushing recipe loaded for " + input); ItemStack result = recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); ResourceLocation expectedId = expectedItem.contains(":") @@ -878,7 +878,7 @@ private static void assertCrushingRecipe(GameTestHelper helper, ItemStack input, private static void tickEffects(BaseMetalsEvents events, ServerPlayer player) { player.tickCount = 20; - events.onPlayerTick(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player)); + events.onPlayerTick(new TickEvent.PlayerTickEvent.Post(player)); } private static int effectAmplifier(LivingEntity entity, net.minecraft.core.Holder effect) { @@ -889,7 +889,7 @@ private static int effectAmplifier(LivingEntity entity, net.minecraft.core.Holde private static void assertSmeltingRecipe(GameTestHelper helper, ItemStack input, String expectedItem, int expectedCount) { var recipe = helper.getLevel().getRecipeManager().getRecipeFor( - RecipeType.SMELTING, new SimpleContainer(input), helper.getLevel()); + RecipeType.SMELTING, new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isPresent(), "No furnace recipe loaded for " + input); if (recipe.isEmpty()) return; ItemStack result = recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); @@ -903,7 +903,7 @@ private static void assertSmeltingRecipe(GameTestHelper helper, ItemStack input, private static void assertSmeltingRecipeInTag(GameTestHelper helper, ItemStack input, String expectedTag, int expectedCount) { var recipe = helper.getLevel().getRecipeManager().getRecipeFor( - RecipeType.SMELTING, new SimpleContainer(input), helper.getLevel()); + RecipeType.SMELTING, new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isPresent(), "No furnace recipe loaded for " + input); if (recipe.isEmpty()) return; ItemStack result = recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); @@ -918,7 +918,7 @@ private static void assertSmeltingRecipeInTag(GameTestHelper helper, ItemStack i private static void assertNoSmeltingRecipe(GameTestHelper helper, ItemStack input) { var recipe = helper.getLevel().getRecipeManager().getRecipeFor( - RecipeType.SMELTING, new SimpleContainer(input), helper.getLevel()); + RecipeType.SMELTING, new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isEmpty(), input + " unexpectedly has a furnace recipe"); } @@ -960,7 +960,7 @@ public static void projectilesRetainAmmunitionAcrossSaveAndSpawnData(GameTestHel Player shooter = helper.makeMockPlayer(GameType.SURVIVAL); ItemStack ammunition = ModContent.item("starsteel_bolt").get().getDefaultInstance(); MaterialProjectile original = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel(), shooter, ammunition); - require(helper, original.getAddEntityPacket().getClass().getName().contains("CustomPayload"), + require(helper, original.getAddEntityPacket(null).getClass().getName().contains("CustomPayload"), "Projectile uses the vanilla packet, so Forge ammunition data cannot reach the client"); CompoundTag saved = new CompoundTag(); @@ -999,9 +999,9 @@ public static void oreLootSupportsRawFortuneSilkTouchAndHammering(GameTestHelper ServerPlayer player = survivalPlayer(helper); ItemStack pickaxe = Items.NETHERITE_PICKAXE.getDefaultInstance(); ItemStack silk = pickaxe.copy(); - silk.enchant(Enchantments.SILK_TOUCH, 1); + silk.enchant(enchantment(helper, Enchantments.SILK_TOUCH), 1); ItemStack fortune = pickaxe.copy(); - fortune.enchant(Enchantments.FORTUNE, 3); + fortune.enchant(enchantment(helper, Enchantments.FORTUNE), 3); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); for (var entry : ModContent.blocksById().entrySet()) { if (!entry.getKey().endsWith("_ore")) continue; @@ -1049,19 +1049,31 @@ public static void fullyDrawnWeaponsApplyMaterialDamageBeforePower(GameTestHelpe String launcher = material + (crossbow ? "_crossbow" : "_bow"); String ammo = material + (crossbow ? "_bolt" : "_arrow"); ItemStack weapon = ModContent.item(launcher).get().getDefaultInstance(); - if (power > 0) weapon.enchant(Enchantments.POWER, power); + if (power > 0) weapon.enchant(enchantment(helper, Enchantments.POWER), power); player.setItemInHand(InteractionHand.MAIN_HAND, weapon); player.getInventory().setItem(1, ModContent.item(ammo).get().getDefaultInstance()); player.startUsingItem(InteractionHand.MAIN_HAND); - weapon.getItem().releaseUsing(weapon, helper.getLevel(), player, weapon.getUseDuration() - 20); + weapon.getItem().releaseUsing(weapon, helper.getLevel(), player, weapon.getUseDuration(player) - 20); var projectiles = new ArrayList(); helper.getLevel().getAllEntities().forEach(entity -> { if (entity instanceof MaterialProjectile arrow && arrow.getOwner() == player) projectiles.add(arrow); }); - double damage = ((MaterialBacked) weapon.getItem()).baseMetalsMaterial().baseAttackDamage() * 2.0D - + (power == 0 ? 0 : power * 0.5D + 0.5D); - require(helper, projectiles.size() == 1 && close(projectiles.get(0).getBaseDamage(), damage), - launcher + " Power " + power + " did not use material damage=" + damage); + double baseDamage = ((MaterialBacked) weapon.getItem()).baseMetalsMaterial().baseAttackDamage() * 2.0D; + require(helper, projectiles.size() == 1 && close(projectiles.get(0).getBaseDamage(), baseDamage), + launcher + " did not keep the material base damage=" + baseDamage); + + MaterialProjectile projectile = projectiles.getFirst(); + var target = EntityType.ZOMBIE.create(helper.getLevel()); + double damage = EnchantmentHelper.modifyDamage(helper.getLevel(), projectile.getWeaponItem(), target, + helper.getLevel().damageSources().arrow(projectile, player), (float) baseDamage); + var vanilla = ((net.minecraft.world.item.ArrowItem) Items.ARROW) + .createArrow(helper.getLevel(), Items.ARROW.getDefaultInstance(), player, weapon); + double vanillaDamage = EnchantmentHelper.modifyDamage(helper.getLevel(), weapon, target, + helper.getLevel().damageSources().arrow(vanilla, player), 2.0F); + double expected = baseDamage + vanillaDamage - 2.0D; + require(helper, power == 0 || vanillaDamage > 2.0D, "The vanilla Power reference did not apply"); + require(helper, close(damage, expected), launcher + " Power " + power + " damage=" + damage + + " instead of " + expected); require(helper, player.getInventory().getItem(1).isEmpty() && weapon.getDamageValue() == 1, launcher + " did not consume ammunition and durability"); projectiles.forEach(Entity::discard); @@ -1078,6 +1090,12 @@ private static double attribute(ItemStack stack, net.minecraft.core.Holder entry.modifier().amount()).sum(); } + private static net.minecraft.core.Holder enchantment( + GameTestHelper helper, net.minecraft.resources.ResourceKey key) { + return helper.getLevel().registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.ENCHANTMENT) + .getOrThrow(key); + } + private static int burnTime(String item) { ItemStack stack = ModContent.item(item).get().getDefaultInstance(); return net.minecraftforge.common.ForgeHooks.getBurnTime(stack, RecipeType.SMELTING); diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java index a858ff972..062c494a0 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java @@ -4,16 +4,29 @@ import com.mojang.authlib.GameProfile; import java.util.UUID; import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.Registries; import net.minecraft.gametest.framework.GameTest; import net.minecraft.gametest.framework.GameTestHelper; -import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.ArrowItem; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.BowItem; +import net.minecraft.world.item.DiggerItem; +import net.minecraft.world.item.FishingRodItem; +import net.minecraft.world.item.ShearsItem; +import net.minecraft.world.item.crafting.CraftingInput; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraftforge.gametest.GameTestHolder; import net.minecraftforge.gametest.GameTestDontPrefix; +import net.minecraftforge.registries.ForgeRegistries; import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.compat.VanillaCopper; import zone.moddev.mc.basemetals.material.MaterialCatalogue; import zone.moddev.mc.basemetals.recipe.CrushingRecipe; @@ -34,14 +47,15 @@ public static void everyRangedMaterialContributesItsDamage(GameTestHelper helper BaseMetalAmmoItem bolt = (BaseMetalAmmoItem) ModContent.item(material + "_bolt").get(); require(helper, arrow.kind() == BaseMetalAmmoItem.Kind.ARROW && bolt.kind() == BaseMetalAmmoItem.Kind.BOLT, material + " ammunition identity changed"); - AbstractArrow shot = bow.customArrow(arrow.createArrow(helper.getLevel(), arrow.getDefaultInstance(), player)); + AbstractArrow shot = bow.customArrow(arrow.createArrow(helper.getLevel(), arrow.getDefaultInstance(), player, + bow.getDefaultInstance())); require(helper, close(shot.getBaseDamage(), 2 * bow.baseMetalsMaterial().baseAttackDamage()), material + " did not use launcher plus ammunition damage"); - AbstractArrow ordinary = ((ArrowItem) Items.ARROW).createArrow(helper.getLevel(), Items.ARROW.getDefaultInstance(), player); + AbstractArrow ordinary = ((ArrowItem) Items.ARROW).createArrow(helper.getLevel(), Items.ARROW.getDefaultInstance(), player, null); require(helper, ordinary.getBaseDamage() == 2.0D, "Vanilla arrow damage changed"); require(helper, close(bow.customArrow(ordinary).getBaseDamage(), 1 + bow.baseMetalsMaterial().baseAttackDamage()), material + " bow with vanilla ammunition has the wrong damage"); - require(helper, close(arrow.createArrow(helper.getLevel(), arrow.getDefaultInstance(), player).getBaseDamage(), + require(helper, close(arrow.createArrow(helper.getLevel(), arrow.getDefaultInstance(), player, null).getBaseDamage(), 1 + arrow.baseMetalsMaterial().baseAttackDamage()), "Vanilla launcher ammunition contribution changed"); checked++; } @@ -57,10 +71,10 @@ public static void rawCrushingAndSilkTouchInventoriesRemainSeparate(GameTestHelp ItemStack raw = material.name().equals("copper") ? Items.RAW_COPPER.getDefaultInstance() : ModContent.item(material.name() + "_raw").get().getDefaultInstance(); var crushed = helper.getLevel().getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), - new SimpleContainer(raw), helper.getLevel()).orElseThrow(); + new SingleRecipeInput(raw), helper.getLevel()).orElseThrow(); require(helper, crushed.value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getCount() == 1, material.name() + " raw material was doubled"); var ore = helper.getLevel().getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), - new SimpleContainer(ModContent.item(material.name() + "_ore").get().getDefaultInstance()), + new SingleRecipeInput(ModContent.item(material.name() + "_ore").get().getDefaultInstance()), helper.getLevel()).orElseThrow(); require(helper, ore.value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getCount() == 2, material.name() + " ore hammer yield changed"); checked++; @@ -84,6 +98,87 @@ public static void thinTransparentBlocksDoNotHideTheirNeighbours(GameTestHelper helper.succeed(); } + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper helper) { + var level = helper.getLevel(); + + for (var entry : VanillaCopper.equivalents().entrySet()) { + var legacy = ForgeRegistries.ITEMS.getValue(ResourceLocation.parse(entry.getKey())); + var vanilla = ForgeRegistries.ITEMS.getValue(ResourceLocation.parse(entry.getValue())); + var tag = ItemTags.create(ResourceLocation.parse(VanillaCopper.ingredientTag(entry.getKey()))); + + require(helper, legacy != null && legacy != Items.AIR && vanilla != null && vanilla != Items.AIR, + "A copper save identity or its vanilla equivalent is missing: " + entry); + require(helper, legacy.getDefaultInstance().is(tag) && vanilla.getDefaultInstance().is(tag), + "Copper equivalents cannot share an ingredient: " + entry); + + String path = entry.getKey().substring("basemetals:".length()); + String recipeId = path.equals("copper_ingot") ? "copper_ingot_from_nuggets" : path; + var recipe = level.getRecipeManager().byKey(ResourceLocation.fromNamespaceAndPath( + BaseMetals.MOD_ID, recipeId)).orElseThrow(); + require(helper, recipe.value().getResultItem(level.registryAccess()).is(vanilla), + recipeId + " still crafts the old duplicate item"); + } + + for (ItemStack ingot : List.of(Items.COPPER_INGOT.getDefaultInstance(), + ModContent.item("copper_ingot").get().getDefaultInstance())) { + var input = CraftingInput.of(3, 1, + List.of(ingot.copy(), ingot.copy(), ingot.copy())); + var plate = level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, + input, level).orElseThrow().value().assemble(input, level.registryAccess()); + require(helper, plate.is(ModContent.item("copper_plate").get()) && plate.getCount() == 3, + "Copper plate crafting rejected a supported ingot"); + } + + for (var entry : java.util.Map.of(Items.COPPER_TRAPDOOR, 3, + ModContent.item("copper_trapdoor").get(), 4).entrySet()) { + var input = new SingleRecipeInput(entry.getKey().getDefaultInstance()); + ItemStack recycled = level.getRecipeManager().getRecipeFor(RecipeType.SMELTING, + input, level).orElseThrow().value().assemble(input, level.registryAccess()); + require(helper, recycled.is(Items.COPPER_INGOT) && recycled.getCount() == entry.getValue(), + "Copper trapdoor recycling used the wrong material value"); + } + + helper.succeed(); + } + + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + public static void nativeEnchantmentsStillSupportMaterialEquipment(GameTestHelper helper) { + var enchantments = helper.getLevel().registryAccess().lookupOrThrow(Registries.ENCHANTMENT); + int checked = 0; + + for (var registered : ModContent.itemsById().values()) { + var item = registered.get(); + ItemStack stack = item.getDefaultInstance(); + if (!(item instanceof MaterialBacked) || !stack.isDamageableItem()) continue; + + require(helper, enchantments.getOrThrow(Enchantments.UNBREAKING) + .value().canEnchant(stack), "Unbreaking no longer supports " + stack); + + if (item instanceof BowItem) { + require(helper, enchantments.getOrThrow(Enchantments.POWER) + .value().canEnchant(stack), "Power no longer supports " + stack); + } + if (item instanceof DiggerItem || item instanceof ShearsItem) { + require(helper, enchantments.getOrThrow(Enchantments.EFFICIENCY) + .value().canEnchant(stack), "Efficiency no longer supports " + stack); + } + if (item instanceof FishingRodItem) { + require(helper, enchantments.getOrThrow(Enchantments.LURE) + .value().canEnchant(stack), "Lure no longer supports " + stack); + } + if (item instanceof ArmorItem) { + require(helper, enchantments.getOrThrow(Enchantments.PROTECTION) + .value().canEnchant(stack), "Protection no longer supports " + stack); + } + + checked++; + } + + require(helper, checked > 300, "The complete equipment catalogue was not checked"); + helper.succeed(); + } + private static boolean close(double actual, double expected) { return Math.abs(actual - expected) < 0.0001D; } diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java index b76aa0dd1..b80f41883 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java @@ -1,6 +1,7 @@ package zone.moddev.mc.basemetals.content; import io.netty.buffer.Unpooled; +import net.minecraft.core.registries.Registries; import net.minecraft.core.component.DataComponents; import net.minecraft.gametest.framework.GameTest; import net.minecraft.gametest.framework.GameTestHelper; @@ -8,8 +9,12 @@ import net.minecraft.nbt.ListTag; import net.minecraft.nbt.StringTag; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.component.CustomData; import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.enchantment.Enchantments; import net.minecraftforge.gametest.GameTestDontPrefix; import net.minecraftforge.gametest.GameTestHolder; import zone.moddev.mc.basemetals.BaseMetals; @@ -76,4 +81,44 @@ public static void oldEmbeddedBoltsKeepTheirCustomItemData(GameTestHelper helper helper.assertTrue(net.minecraft.world.item.ItemStack.matches(item, reloaded.getItem()), "A converted bolt changed on reload"); helper.succeed(); } + + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + public static void projectilesKeepWeaponEnchantmentsAfterReload(GameTestHelper helper) { + var level = helper.getLevel(); + var enchantments = level.registryAccess().lookupOrThrow(Registries.ENCHANTMENT); + var shooter = EntityType.ZOMBIE.create(level); + var target = EntityType.ZOMBIE.create(level); + + for (boolean bolt : new boolean[] {false, true}) { + ItemStack weapon = ModContent.item("steel_" + (bolt ? "crossbow" : "bow")).get().getDefaultInstance(); + weapon.enchant(enchantments.getOrThrow(Enchantments.POWER), 3); + weapon.enchant(enchantments.getOrThrow(Enchantments.PUNCH), 2); + weapon.enchant(enchantments.getOrThrow(Enchantments.FLAME), 1); + + ItemStack ammunition = ModContent.item("steel_" + (bolt ? "bolt" : "arrow")).get().getDefaultInstance(); + var type = bolt ? ModEntities.CUSTOM_BOLT.get() : ModEntities.CUSTOM_ARROW.get(); + MaterialProjectile projectile = new MaterialProjectile(type, level, shooter, ammunition, weapon); + + helper.assertTrue(projectile.isOnFire(), "Flame did not ignite the material projectile"); + + CompoundTag saved = projectile.saveWithoutId(new CompoundTag()); + MaterialProjectile reloaded = new MaterialProjectile(type, level); + reloaded.load(saved); + + helper.assertTrue(ItemStack.matches(weapon, reloaded.getWeaponItem()), + "The saved projectile lost its firing weapon or enchantments"); + helper.assertTrue(ItemStack.matches(ammunition, reloaded.getItem()), + "The saved projectile lost its ammunition"); + helper.assertTrue(reloaded.isOnFire(), "The saved projectile lost Flame"); + + var source = level.damageSources().arrow(reloaded, shooter); + float knockback = EnchantmentHelper.modifyKnockback(level, reloaded.getWeaponItem(), target, source, 0.0F); + float damage = EnchantmentHelper.modifyDamage(level, reloaded.getWeaponItem(), target, source, 2.0F); + + helper.assertTrue(knockback > 0.0F, "Punch did not apply after reload"); + helper.assertTrue(damage > 2.0F, "Power did not apply after reload"); + } + + helper.succeed(); + } } diff --git a/src/generated/resources/data/basemetals/advancements/angel_of_death.json b/src/generated/resources/data/basemetals/advancement/angel_of_death.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/angel_of_death.json rename to src/generated/resources/data/basemetals/advancement/angel_of_death.json diff --git a/src/generated/resources/data/basemetals/advancements/aquarium_maker.json b/src/generated/resources/data/basemetals/advancement/aquarium_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/aquarium_maker.json rename to src/generated/resources/data/basemetals/advancement/aquarium_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/blocktastic.json b/src/generated/resources/data/basemetals/advancement/blocktastic.json similarity index 91% rename from src/generated/resources/data/basemetals/advancements/blocktastic.json rename to src/generated/resources/data/basemetals/advancement/blocktastic.json index b41ccaf74..f1f20d2aa 100644 --- a/src/generated/resources/data/basemetals/advancements/blocktastic.json +++ b/src/generated/resources/data/basemetals/advancement/blocktastic.json @@ -12,7 +12,7 @@ }, "frame": "task", "icon": { - "id": "basemetals:copper_block" + "id": "minecraft:copper_block" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/brass_maker.json b/src/generated/resources/data/basemetals/advancement/brass_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/brass_maker.json rename to src/generated/resources/data/basemetals/advancement/brass_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/bronze_maker.json b/src/generated/resources/data/basemetals/advancement/bronze_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/bronze_maker.json rename to src/generated/resources/data/basemetals/advancement/bronze_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/cupronickel_maker.json b/src/generated/resources/data/basemetals/advancement/cupronickel_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/cupronickel_maker.json rename to src/generated/resources/data/basemetals/advancement/cupronickel_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/demon_slayer.json b/src/generated/resources/data/basemetals/advancement/demon_slayer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/demon_slayer.json rename to src/generated/resources/data/basemetals/advancement/demon_slayer.json diff --git a/src/generated/resources/data/basemetals/advancements/electrum_maker.json b/src/generated/resources/data/basemetals/advancement/electrum_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/electrum_maker.json rename to src/generated/resources/data/basemetals/advancement/electrum_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/geologist.json b/src/generated/resources/data/basemetals/advancement/geologist.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/geologist.json rename to src/generated/resources/data/basemetals/advancement/geologist.json diff --git a/src/generated/resources/data/basemetals/advancements/invar_maker.json b/src/generated/resources/data/basemetals/advancement/invar_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/invar_maker.json rename to src/generated/resources/data/basemetals/advancement/invar_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/juggernaut.json b/src/generated/resources/data/basemetals/advancement/juggernaut.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/juggernaut.json rename to src/generated/resources/data/basemetals/advancement/juggernaut.json diff --git a/src/generated/resources/data/basemetals/advancements/metallurgy.json b/src/generated/resources/data/basemetals/advancement/metallurgy.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/metallurgy.json rename to src/generated/resources/data/basemetals/advancement/metallurgy.json diff --git a/src/generated/resources/data/basemetals/advancements/mithril_maker.json b/src/generated/resources/data/basemetals/advancement/mithril_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/mithril_maker.json rename to src/generated/resources/data/basemetals/advancement/mithril_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/moon_boots.json b/src/generated/resources/data/basemetals/advancement/moon_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/moon_boots.json rename to src/generated/resources/data/basemetals/advancement/moon_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/pewter_maker.json b/src/generated/resources/data/basemetals/advancement/pewter_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/pewter_maker.json rename to src/generated/resources/data/basemetals/advancement/pewter_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json b/src/generated/resources/data/basemetals/advancement/recipes/activator_rail.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json rename to src/generated/resources/data/basemetals/advancement/recipes/activator_rail.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_anvil.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/adamantine_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/adamantine_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/antimony_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/antimony_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/aquarium_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/aquarium_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/bismuth_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/bismuth_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/brass_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/brass_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/bronze_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/bronze_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/charcoal_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/charcoal_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_block_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json rename to src/generated/resources/data/basemetals/advancement/recipes/charcoal_block_dust.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/charcoal_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_nugget.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/charcoal_nugget.json rename to src/generated/resources/data/basemetals/advancement/recipes/charcoal_nugget.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/charcoal_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/charcoal_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/charcoal_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json b/src/generated/resources/data/basemetals/advancement/recipes/coal_block_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json rename to src/generated/resources/data/basemetals/advancement/recipes/coal_block_dust.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/coal_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/coal_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_nugget.json b/src/generated/resources/data/basemetals/advancement/recipes/coal_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coal_nugget.json rename to src/generated/resources/data/basemetals/advancement/recipes/coal_nugget.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/coal_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/coal_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/coal_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/coal_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/coldiron_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/coldiron_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_block.json similarity index 90% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_block.json index 7927c13f2..b701f8be2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json +++ b/src/generated/resources/data/basemetals/advancement/recipes/copper_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "basemetals:copper_ingot" - ] + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_block_ingot.json similarity index 90% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_block_ingot.json index 8e0d12046..f1ba3890b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancement/recipes/copper_block_ingot.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "basemetals:copper_block" - ] + "items": "#forge:storage_blocks/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_nuggets.json similarity index 90% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_nuggets.json index b1275c512..2791750c7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/advancement/recipes/copper_nuggets.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "basemetals:copper_ingot" - ] + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/copper_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/cupronickel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/cupronickel_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json b/src/generated/resources/data/basemetals/advancement/recipes/detector_rail.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json rename to src/generated/resources/data/basemetals/advancement/recipes/detector_rail.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/diamond_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/diamond_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/electrum_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/electrum_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/emerald_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/emerald_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json b/src/generated/resources/data/basemetals/advancement/recipes/flint_and_steel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json rename to src/generated/resources/data/basemetals/advancement/recipes/flint_and_steel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/gold_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/gold_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json b/src/generated/resources/data/basemetals/advancement/recipes/human_detector.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/human_detector.json rename to src/generated/resources/data/basemetals/advancement/recipes/human_detector.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/invar_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/invar_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/iron_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/iron_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/lead_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/lead_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/mercury_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/mercury_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/mercury_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/mercury_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/mercury_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/mercury_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/mercury_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/mercury_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/mercury_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/mercury_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/mercury_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/mercury_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/minecart.json b/src/generated/resources/data/basemetals/advancement/recipes/minecart.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/minecart.json rename to src/generated/resources/data/basemetals/advancement/recipes/minecart.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/mithril_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/mithril_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/nickel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/nickel_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_nugget.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/obsidian_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/obsidian_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/pewter_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/pewter_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/piston.json b/src/generated/resources/data/basemetals/advancement/recipes/piston.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/piston.json rename to src/generated/resources/data/basemetals/advancement/recipes/piston.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/platinum_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/platinum_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_nugget.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/quartz_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/quartz_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/rail.json b/src/generated/resources/data/basemetals/advancement/recipes/rail.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/rail.json rename to src/generated/resources/data/basemetals/advancement/recipes/rail.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/redstone_from_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/redstone_from_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/redstone_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/redstone_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/silver_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/silver_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/starsteel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/starsteel_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_anvil.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_blend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_smallblend.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/steel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/steel_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json b/src/generated/resources/data/basemetals/advancement/recipes/stone_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json rename to src/generated/resources/data/basemetals/advancement/recipes/stone_anvil.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/stone_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/stone_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/stone_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/stone_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/tin_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/tin_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json b/src/generated/resources/data/basemetals/advancement/recipes/tripwire_hook.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json rename to src/generated/resources/data/basemetals/advancement/recipes/tripwire_hook.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/wood_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/wood_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/wood_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/wood_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_arrow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_axe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_bars.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_bars_2.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_block.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_block.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_block_ingot.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_bolt.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_boots.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_bow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_button.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_button.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_chestplate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_crackhammer.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_crossbow.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_door.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_door.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_fishingrod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_gear.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_helmet.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_hoe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_horsearmor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_leggings.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_lever.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_nuggets.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_pickaxe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_blasting.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_blasting.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_smelting.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_smelting.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_rod.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_scythe.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_shears.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_shield.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_shovel.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_slab.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_smallpowder.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_stairs.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_sword.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_trapdoor.json diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json b/src/generated/resources/data/basemetals/advancement/recipes/zinc_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json rename to src/generated/resources/data/basemetals/advancement/recipes/zinc_wall.json diff --git a/src/generated/resources/data/basemetals/advancements/scuba_diver.json b/src/generated/resources/data/basemetals/advancement/scuba_diver.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/scuba_diver.json rename to src/generated/resources/data/basemetals/advancement/scuba_diver.json diff --git a/src/generated/resources/data/basemetals/advancements/steel_maker.json b/src/generated/resources/data/basemetals/advancement/steel_maker.json similarity index 100% rename from src/generated/resources/data/basemetals/advancements/steel_maker.json rename to src/generated/resources/data/basemetals/advancement/steel_maker.json diff --git a/src/generated/resources/data/basemetals/advancements/this_is_new.json b/src/generated/resources/data/basemetals/advancement/this_is_new.json similarity index 91% rename from src/generated/resources/data/basemetals/advancements/this_is_new.json rename to src/generated/resources/data/basemetals/advancement/this_is_new.json index d614be640..260e4e224 100644 --- a/src/generated/resources/data/basemetals/advancements/this_is_new.json +++ b/src/generated/resources/data/basemetals/advancement/this_is_new.json @@ -12,7 +12,7 @@ }, "frame": "task", "icon": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_anvil.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_anvil.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_anvil.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_ore.json index 49a53e1d5..c094e09c6 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/adamantine_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/adamantine_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_ore.json index 7ed351890..e26c7670e 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/antimony_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/antimony_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/antimony_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/aquarium_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/aquarium_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/aquarium_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_ore.json index e8d447164..614aace6f 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/bismuth_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bismuth_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/brass_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/brass_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/brass_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/brass_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bronze_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/bronze_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/bronze_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/bronze_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/charcoal_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/charcoal_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/charcoal_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/charcoal_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_ore.json index 4c5506caf..77a3df68a 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/coldiron_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/coldiron_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_ore.json index 9c43250fe..a31d36dcb 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/copper_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/copper_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/copper_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/copper_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/cupronickel_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/cupronickel_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/diamond_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/diamond_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/diamond_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/diamond_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_adamantine_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_adamantine_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_adamantine_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_adamantine_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_antimony_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_antimony_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_antimony_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_antimony_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_aquarium_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_aquarium_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_aquarium_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_aquarium_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_bismuth_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_bismuth_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_bismuth_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_bismuth_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_brass_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_brass_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_brass_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_brass_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_bronze_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_bronze_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_bronze_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_bronze_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_coldiron_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_coldiron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_coldiron_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_coldiron_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_copper_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_copper_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_copper_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_copper_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_cupronickel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_cupronickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_cupronickel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_cupronickel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_diamond_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_diamond_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_diamond_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_diamond_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_electrum_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_electrum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_electrum_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_electrum_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_emerald_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_emerald_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_emerald_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_emerald_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_gold_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_gold_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_gold_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_gold_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_invar_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_invar_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_invar_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_invar_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_iron_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_iron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_iron_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_iron_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_lead_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_lead_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_lead_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_lead_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_mithril_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_mithril_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_mithril_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_mithril_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_nickel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_nickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_nickel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_nickel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_obsidian_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_obsidian_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_obsidian_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_obsidian_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_pewter_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_pewter_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_pewter_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_pewter_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_platinum_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_platinum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_platinum_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_platinum_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_silver_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_silver_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_silver_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_silver_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_starsteel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_starsteel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_starsteel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_starsteel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_steel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_steel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_steel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_steel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_tin_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_tin_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_tin_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_tin_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/double_zinc_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/double_zinc_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/double_zinc_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/double_zinc_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/electrum_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/electrum_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/electrum_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/electrum_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/emerald_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/emerald_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/emerald_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/emerald_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/gold_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/gold_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/gold_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/gold_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/human_detector.json b/src/generated/resources/data/basemetals/loot_table/blocks/human_detector.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/human_detector.json rename to src/generated/resources/data/basemetals/loot_table/blocks/human_detector.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/invar_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/invar_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/invar_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/invar_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/iron_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/iron_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/iron_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/iron_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/iron_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/iron_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/iron_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/iron_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/iron_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/iron_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/iron_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/iron_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/iron_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/iron_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_ore.json index 5a0af9b8f..2ef4ba4b7 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/lead_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/lead_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/lead_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/lead_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/mercury_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mercury_ore.json index 891ca359b..d99001c13 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/mercury_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mithril_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/mithril_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/mithril_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/mithril_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_ore.json index 90a306677..601b6aa8d 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/nickel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/nickel_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/nickel_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/obsidian_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/obsidian_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/obsidian_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/pewter_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/pewter_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/pewter_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/pewter_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_ore.json index 5d14e43bb..245fcc98f 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/platinum_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/platinum_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/platinum_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/quartz_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/quartz_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/quartz_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/quartz_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_ore.json index fc20e7186..954c3237a 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/silver_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/silver_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/silver_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/silver_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_ore.json index 2e384db10..40d2cf87f 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/starsteel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/starsteel_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_anvil.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_anvil.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_anvil.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/steel_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/steel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/steel_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/steel_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/stone_anvil.json b/src/generated/resources/data/basemetals/loot_table/blocks/stone_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/stone_anvil.json rename to src/generated/resources/data/basemetals/loot_table/blocks/stone_anvil.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_ore.json index dd1642a42..5d28c5537 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/tin_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/tin_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/tin_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/tin_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_bars.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_bars.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_bars.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_block.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_block.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_block.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_block.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_button.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_button.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_button.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_button.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_door.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_door.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_door.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_door.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_lever.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_lever.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_lever.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_ore.json similarity index 95% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_ore.json index d05a8a9c8..814ff9b74 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json +++ b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_ore.json @@ -15,7 +15,7 @@ "predicates": { "minecraft:enchantments": [ { - "enchantment": "minecraft:silk_touch", + "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_pressure_plate.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_slab.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_slab.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_slab.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_stairs.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_stairs.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_stairs.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_trapdoor.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_trapdoor.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_trapdoor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_wall.json b/src/generated/resources/data/basemetals/loot_table/blocks/zinc_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/blocks/zinc_wall.json rename to src/generated/resources/data/basemetals/loot_table/blocks/zinc_wall.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json similarity index 99% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json index db1aad06e..55c23631f 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json @@ -75,7 +75,7 @@ "function": "minecraft:set_count" } ], - "name": "basemetals:copper_ingot", + "name": "minecraft:copper_ingot", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/desert_pyramid.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/desert_pyramid.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/desert_pyramid.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/desert_pyramid.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/end_city_treasure.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/end_city_treasure.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/end_city_treasure.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/end_city_treasure.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/jungle_temple.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/jungle_temple.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/jungle_temple.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/jungle_temple.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/nether_bridge.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/nether_bridge.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/nether_bridge.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/nether_bridge.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/simple_dungeon.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/simple_dungeon.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/simple_dungeon.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/simple_dungeon.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/spawn_bonus_chest.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/spawn_bonus_chest.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/spawn_bonus_chest.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/spawn_bonus_chest.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_corridor.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_corridor.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_corridor.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_corridor.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_crossing.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_crossing.json similarity index 100% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_crossing.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_crossing.json diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_armorer.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json similarity index 99% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/village_armorer.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json index 500aa51a5..2d667ad23 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_armorer.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json @@ -334,7 +334,7 @@ "function": "minecraft:set_count" } ], - "name": "basemetals:copper_ingot", + "name": "minecraft:copper_ingot", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_toolsmith.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json similarity index 99% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/village_toolsmith.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json index 500aa51a5..2d667ad23 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_toolsmith.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json @@ -334,7 +334,7 @@ "function": "minecraft:set_count" } ], - "name": "basemetals:copper_ingot", + "name": "minecraft:copper_ingot", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_weaponsmith.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json similarity index 99% rename from src/generated/resources/data/basemetals/loot_tables/chests/inject/village_weaponsmith.json rename to src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json index 500aa51a5..2d667ad23 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_weaponsmith.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json @@ -334,7 +334,7 @@ "function": "minecraft:set_count" } ], - "name": "basemetals:copper_ingot", + "name": "minecraft:copper_ingot", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/recipes/activator_rail.json b/src/generated/resources/data/basemetals/recipe/activator_rail.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/activator_rail.json rename to src/generated/resources/data/basemetals/recipe/activator_rail.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json b/src/generated/resources/data/basemetals/recipe/adamantine_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_anvil.json rename to src/generated/resources/data/basemetals/recipe/adamantine_anvil.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json b/src/generated/resources/data/basemetals/recipe/adamantine_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_arrow.json rename to src/generated/resources/data/basemetals/recipe/adamantine_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_axe.json b/src/generated/resources/data/basemetals/recipe/adamantine_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_axe.json rename to src/generated/resources/data/basemetals/recipe/adamantine_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars.json b/src/generated/resources/data/basemetals/recipe/adamantine_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bars.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json b/src/generated/resources/data/basemetals/recipe/adamantine_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block.json b/src/generated/resources/data/basemetals/recipe/adamantine_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_block.json rename to src/generated/resources/data/basemetals/recipe/adamantine_block.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/recipe/adamantine_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/adamantine_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json b/src/generated/resources/data/basemetals/recipe/adamantine_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bolt.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_boots.json b/src/generated/resources/data/basemetals/recipe/adamantine_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_boots.json rename to src/generated/resources/data/basemetals/recipe/adamantine_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/adamantine_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bow.json b/src/generated/resources/data/basemetals/recipe/adamantine_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bow.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_button.json b/src/generated/resources/data/basemetals/recipe/adamantine_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_button.json rename to src/generated/resources/data/basemetals/recipe/adamantine_button.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_button_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json rename to src/generated/resources/data/basemetals/recipe/adamantine_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/adamantine_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/adamantine_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json b/src/generated/resources/data/basemetals/recipe/adamantine_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json rename to src/generated/resources/data/basemetals/recipe/adamantine_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_door.json b/src/generated/resources/data/basemetals/recipe/adamantine_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_door.json rename to src/generated/resources/data/basemetals/recipe/adamantine_door.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_door_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/recipe/adamantine_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/adamantine_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_gear.json b/src/generated/resources/data/basemetals/recipe/adamantine_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_gear.json rename to src/generated/resources/data/basemetals/recipe/adamantine_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json b/src/generated/resources/data/basemetals/recipe/adamantine_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_helmet.json rename to src/generated/resources/data/basemetals/recipe/adamantine_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/adamantine_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json b/src/generated/resources/data/basemetals/recipe/adamantine_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_hoe.json rename to src/generated/resources/data/basemetals/recipe/adamantine_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/recipe/adamantine_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/adamantine_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/adamantine_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json b/src/generated/resources/data/basemetals/recipe/adamantine_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_leggings.json rename to src/generated/resources/data/basemetals/recipe/adamantine_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/adamantine_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_lever.json b/src/generated/resources/data/basemetals/recipe/adamantine_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_lever.json rename to src/generated/resources/data/basemetals/recipe/adamantine_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json b/src/generated/resources/data/basemetals/recipe/adamantine_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json rename to src/generated/resources/data/basemetals/recipe/adamantine_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/adamantine_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/adamantine_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/adamantine_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_plate.json b/src/generated/resources/data/basemetals/recipe/adamantine_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_plate.json rename to src/generated/resources/data/basemetals/recipe/adamantine_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/adamantine_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/adamantine_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/adamantine_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/adamantine_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/adamantine_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_rod.json b/src/generated/resources/data/basemetals/recipe/adamantine_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_rod.json rename to src/generated/resources/data/basemetals/recipe/adamantine_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json b/src/generated/resources/data/basemetals/recipe/adamantine_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_scythe.json rename to src/generated/resources/data/basemetals/recipe/adamantine_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shears.json b/src/generated/resources/data/basemetals/recipe/adamantine_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_shears.json rename to src/generated/resources/data/basemetals/recipe/adamantine_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shield.json b/src/generated/resources/data/basemetals/recipe/adamantine_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_shield.json rename to src/generated/resources/data/basemetals/recipe/adamantine_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/adamantine_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json b/src/generated/resources/data/basemetals/recipe/adamantine_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_shovel.json rename to src/generated/resources/data/basemetals/recipe/adamantine_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_slab.json b/src/generated/resources/data/basemetals/recipe/adamantine_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_slab.json rename to src/generated/resources/data/basemetals/recipe/adamantine_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/adamantine_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/adamantine_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json b/src/generated/resources/data/basemetals/recipe/adamantine_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_stairs.json rename to src/generated/resources/data/basemetals/recipe/adamantine_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_sword.json b/src/generated/resources/data/basemetals/recipe/adamantine_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_sword.json rename to src/generated/resources/data/basemetals/recipe/adamantine_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/adamantine_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_wall.json b/src/generated/resources/data/basemetals/recipe/adamantine_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_wall.json rename to src/generated/resources/data/basemetals/recipe/adamantine_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/adamantine_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/adamantine_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/ancient_debris_crushing.json b/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/ancient_debris_crushing.json rename to src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_arrow.json b/src/generated/resources/data/basemetals/recipe/antimony_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_arrow.json rename to src/generated/resources/data/basemetals/recipe/antimony_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_axe.json b/src/generated/resources/data/basemetals/recipe/antimony_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_axe.json rename to src/generated/resources/data/basemetals/recipe/antimony_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars.json b/src/generated/resources/data/basemetals/recipe/antimony_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bars.json rename to src/generated/resources/data/basemetals/recipe/antimony_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json b/src/generated/resources/data/basemetals/recipe/antimony_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bars_2.json rename to src/generated/resources/data/basemetals/recipe/antimony_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block.json b/src/generated/resources/data/basemetals/recipe/antimony_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_block.json rename to src/generated/resources/data/basemetals/recipe/antimony_block.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json b/src/generated/resources/data/basemetals/recipe/antimony_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/antimony_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bolt.json b/src/generated/resources/data/basemetals/recipe/antimony_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bolt.json rename to src/generated/resources/data/basemetals/recipe/antimony_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_boots.json b/src/generated/resources/data/basemetals/recipe/antimony_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_boots.json rename to src/generated/resources/data/basemetals/recipe/antimony_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/antimony_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bow.json b/src/generated/resources/data/basemetals/recipe/antimony_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bow.json rename to src/generated/resources/data/basemetals/recipe/antimony_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_button.json b/src/generated/resources/data/basemetals/recipe/antimony_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_button.json rename to src/generated/resources/data/basemetals/recipe/antimony_button.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_button_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json b/src/generated/resources/data/basemetals/recipe/antimony_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_chestplate.json rename to src/generated/resources/data/basemetals/recipe/antimony_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/antimony_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json b/src/generated/resources/data/basemetals/recipe/antimony_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/antimony_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json b/src/generated/resources/data/basemetals/recipe/antimony_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_crossbow.json rename to src/generated/resources/data/basemetals/recipe/antimony_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_door.json b/src/generated/resources/data/basemetals/recipe/antimony_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_door.json rename to src/generated/resources/data/basemetals/recipe/antimony_door.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_door_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json b/src/generated/resources/data/basemetals/recipe/antimony_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/antimony_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_gear.json b/src/generated/resources/data/basemetals/recipe/antimony_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_gear.json rename to src/generated/resources/data/basemetals/recipe/antimony_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_helmet.json b/src/generated/resources/data/basemetals/recipe/antimony_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_helmet.json rename to src/generated/resources/data/basemetals/recipe/antimony_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/antimony_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_hoe.json b/src/generated/resources/data/basemetals/recipe/antimony_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_hoe.json rename to src/generated/resources/data/basemetals/recipe/antimony_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json b/src/generated/resources/data/basemetals/recipe/antimony_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/antimony_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/antimony_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/antimony_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_leggings.json b/src/generated/resources/data/basemetals/recipe/antimony_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_leggings.json rename to src/generated/resources/data/basemetals/recipe/antimony_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/antimony_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_lever.json b/src/generated/resources/data/basemetals/recipe/antimony_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_lever.json rename to src/generated/resources/data/basemetals/recipe/antimony_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json b/src/generated/resources/data/basemetals/recipe/antimony_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_nuggets.json rename to src/generated/resources/data/basemetals/recipe/antimony_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/antimony_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/antimony_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json b/src/generated/resources/data/basemetals/recipe/antimony_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/antimony_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_plate.json b/src/generated/resources/data/basemetals/recipe/antimony_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_plate.json rename to src/generated/resources/data/basemetals/recipe/antimony_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/antimony_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/antimony_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/antimony_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/antimony_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/antimony_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/antimony_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_rod.json b/src/generated/resources/data/basemetals/recipe/antimony_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_rod.json rename to src/generated/resources/data/basemetals/recipe/antimony_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_scythe.json b/src/generated/resources/data/basemetals/recipe/antimony_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_scythe.json rename to src/generated/resources/data/basemetals/recipe/antimony_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shears.json b/src/generated/resources/data/basemetals/recipe/antimony_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_shears.json rename to src/generated/resources/data/basemetals/recipe/antimony_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shield.json b/src/generated/resources/data/basemetals/recipe/antimony_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_shield.json rename to src/generated/resources/data/basemetals/recipe/antimony_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/antimony_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shovel.json b/src/generated/resources/data/basemetals/recipe/antimony_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_shovel.json rename to src/generated/resources/data/basemetals/recipe/antimony_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_slab.json b/src/generated/resources/data/basemetals/recipe/antimony_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_slab.json rename to src/generated/resources/data/basemetals/recipe/antimony_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json b/src/generated/resources/data/basemetals/recipe/antimony_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/antimony_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/antimony_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_stairs.json b/src/generated/resources/data/basemetals/recipe/antimony_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_stairs.json rename to src/generated/resources/data/basemetals/recipe/antimony_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_sword.json b/src/generated/resources/data/basemetals/recipe/antimony_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_sword.json rename to src/generated/resources/data/basemetals/recipe/antimony_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json b/src/generated/resources/data/basemetals/recipe/antimony_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/antimony_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_wall.json b/src/generated/resources/data/basemetals/recipe/antimony_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_wall.json rename to src/generated/resources/data/basemetals/recipe/antimony_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/antimony_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/antimony_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/antimony_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json b/src/generated/resources/data/basemetals/recipe/aquarium_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_arrow.json rename to src/generated/resources/data/basemetals/recipe/aquarium_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_axe.json b/src/generated/resources/data/basemetals/recipe/aquarium_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_axe.json rename to src/generated/resources/data/basemetals/recipe/aquarium_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars.json b/src/generated/resources/data/basemetals/recipe/aquarium_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bars.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json b/src/generated/resources/data/basemetals/recipe/aquarium_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend.json b/src/generated/resources/data/basemetals/recipe/aquarium_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_blend.json rename to src/generated/resources/data/basemetals/recipe/aquarium_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/aquarium_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/aquarium_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/aquarium_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block.json b/src/generated/resources/data/basemetals/recipe/aquarium_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_block.json rename to src/generated/resources/data/basemetals/recipe/aquarium_block.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/recipe/aquarium_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/aquarium_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json b/src/generated/resources/data/basemetals/recipe/aquarium_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bolt.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_boots.json b/src/generated/resources/data/basemetals/recipe/aquarium_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_boots.json rename to src/generated/resources/data/basemetals/recipe/aquarium_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bow.json b/src/generated/resources/data/basemetals/recipe/aquarium_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bow.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_button.json b/src/generated/resources/data/basemetals/recipe/aquarium_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_button.json rename to src/generated/resources/data/basemetals/recipe/aquarium_button.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_button_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json b/src/generated/resources/data/basemetals/recipe/aquarium_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json rename to src/generated/resources/data/basemetals/recipe/aquarium_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/aquarium_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json b/src/generated/resources/data/basemetals/recipe/aquarium_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json rename to src/generated/resources/data/basemetals/recipe/aquarium_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_door.json b/src/generated/resources/data/basemetals/recipe/aquarium_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_door.json rename to src/generated/resources/data/basemetals/recipe/aquarium_door.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_door_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/recipe/aquarium_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/aquarium_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_gear.json b/src/generated/resources/data/basemetals/recipe/aquarium_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_gear.json rename to src/generated/resources/data/basemetals/recipe/aquarium_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json b/src/generated/resources/data/basemetals/recipe/aquarium_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_helmet.json rename to src/generated/resources/data/basemetals/recipe/aquarium_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json b/src/generated/resources/data/basemetals/recipe/aquarium_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_hoe.json rename to src/generated/resources/data/basemetals/recipe/aquarium_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/recipe/aquarium_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/aquarium_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/aquarium_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json b/src/generated/resources/data/basemetals/recipe/aquarium_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_leggings.json rename to src/generated/resources/data/basemetals/recipe/aquarium_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_lever.json b/src/generated/resources/data/basemetals/recipe/aquarium_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_lever.json rename to src/generated/resources/data/basemetals/recipe/aquarium_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json b/src/generated/resources/data/basemetals/recipe/aquarium_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json rename to src/generated/resources/data/basemetals/recipe/aquarium_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/aquarium_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_plate.json b/src/generated/resources/data/basemetals/recipe/aquarium_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_plate.json rename to src/generated/resources/data/basemetals/recipe/aquarium_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/aquarium_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/aquarium_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/aquarium_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_rod.json b/src/generated/resources/data/basemetals/recipe/aquarium_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_rod.json rename to src/generated/resources/data/basemetals/recipe/aquarium_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json b/src/generated/resources/data/basemetals/recipe/aquarium_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_scythe.json rename to src/generated/resources/data/basemetals/recipe/aquarium_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shears.json b/src/generated/resources/data/basemetals/recipe/aquarium_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_shears.json rename to src/generated/resources/data/basemetals/recipe/aquarium_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shield.json b/src/generated/resources/data/basemetals/recipe/aquarium_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_shield.json rename to src/generated/resources/data/basemetals/recipe/aquarium_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json b/src/generated/resources/data/basemetals/recipe/aquarium_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_shovel.json rename to src/generated/resources/data/basemetals/recipe/aquarium_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_slab.json b/src/generated/resources/data/basemetals/recipe/aquarium_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_slab.json rename to src/generated/resources/data/basemetals/recipe/aquarium_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json rename to src/generated/resources/data/basemetals/recipe/aquarium_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/aquarium_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/aquarium_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/aquarium_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json b/src/generated/resources/data/basemetals/recipe/aquarium_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_stairs.json rename to src/generated/resources/data/basemetals/recipe/aquarium_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_sword.json b/src/generated/resources/data/basemetals/recipe/aquarium_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_sword.json rename to src/generated/resources/data/basemetals/recipe/aquarium_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/aquarium_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_wall.json b/src/generated/resources/data/basemetals/recipe/aquarium_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_wall.json rename to src/generated/resources/data/basemetals/recipe/aquarium_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/aquarium_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/aquarium_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json b/src/generated/resources/data/basemetals/recipe/bismuth_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_arrow.json rename to src/generated/resources/data/basemetals/recipe/bismuth_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_axe.json b/src/generated/resources/data/basemetals/recipe/bismuth_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_axe.json rename to src/generated/resources/data/basemetals/recipe/bismuth_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars.json b/src/generated/resources/data/basemetals/recipe/bismuth_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bars.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json b/src/generated/resources/data/basemetals/recipe/bismuth_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block.json b/src/generated/resources/data/basemetals/recipe/bismuth_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_block.json rename to src/generated/resources/data/basemetals/recipe/bismuth_block.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/recipe/bismuth_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/bismuth_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json b/src/generated/resources/data/basemetals/recipe/bismuth_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bolt.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_boots.json b/src/generated/resources/data/basemetals/recipe/bismuth_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_boots.json rename to src/generated/resources/data/basemetals/recipe/bismuth_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bismuth_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bow.json b/src/generated/resources/data/basemetals/recipe/bismuth_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bow.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_button.json b/src/generated/resources/data/basemetals/recipe/bismuth_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_button.json rename to src/generated/resources/data/basemetals/recipe/bismuth_button.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_button_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json rename to src/generated/resources/data/basemetals/recipe/bismuth_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bismuth_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/bismuth_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json b/src/generated/resources/data/basemetals/recipe/bismuth_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json rename to src/generated/resources/data/basemetals/recipe/bismuth_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_door.json b/src/generated/resources/data/basemetals/recipe/bismuth_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_door.json rename to src/generated/resources/data/basemetals/recipe/bismuth_door.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_door_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/recipe/bismuth_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/bismuth_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_gear.json b/src/generated/resources/data/basemetals/recipe/bismuth_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_gear.json rename to src/generated/resources/data/basemetals/recipe/bismuth_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json b/src/generated/resources/data/basemetals/recipe/bismuth_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_helmet.json rename to src/generated/resources/data/basemetals/recipe/bismuth_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bismuth_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json b/src/generated/resources/data/basemetals/recipe/bismuth_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_hoe.json rename to src/generated/resources/data/basemetals/recipe/bismuth_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/recipe/bismuth_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/bismuth_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/bismuth_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json b/src/generated/resources/data/basemetals/recipe/bismuth_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_leggings.json rename to src/generated/resources/data/basemetals/recipe/bismuth_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bismuth_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_lever.json b/src/generated/resources/data/basemetals/recipe/bismuth_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_lever.json rename to src/generated/resources/data/basemetals/recipe/bismuth_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json b/src/generated/resources/data/basemetals/recipe/bismuth_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json rename to src/generated/resources/data/basemetals/recipe/bismuth_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/bismuth_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/bismuth_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/bismuth_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_plate.json b/src/generated/resources/data/basemetals/recipe/bismuth_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_plate.json rename to src/generated/resources/data/basemetals/recipe/bismuth_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/bismuth_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/bismuth_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/bismuth_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/bismuth_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/bismuth_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_rod.json b/src/generated/resources/data/basemetals/recipe/bismuth_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_rod.json rename to src/generated/resources/data/basemetals/recipe/bismuth_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json b/src/generated/resources/data/basemetals/recipe/bismuth_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_scythe.json rename to src/generated/resources/data/basemetals/recipe/bismuth_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shears.json b/src/generated/resources/data/basemetals/recipe/bismuth_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_shears.json rename to src/generated/resources/data/basemetals/recipe/bismuth_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shield.json b/src/generated/resources/data/basemetals/recipe/bismuth_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_shield.json rename to src/generated/resources/data/basemetals/recipe/bismuth_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bismuth_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json b/src/generated/resources/data/basemetals/recipe/bismuth_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_shovel.json rename to src/generated/resources/data/basemetals/recipe/bismuth_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_slab.json b/src/generated/resources/data/basemetals/recipe/bismuth_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_slab.json rename to src/generated/resources/data/basemetals/recipe/bismuth_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/bismuth_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/bismuth_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json b/src/generated/resources/data/basemetals/recipe/bismuth_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_stairs.json rename to src/generated/resources/data/basemetals/recipe/bismuth_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_sword.json b/src/generated/resources/data/basemetals/recipe/bismuth_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_sword.json rename to src/generated/resources/data/basemetals/recipe/bismuth_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/bismuth_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_wall.json b/src/generated/resources/data/basemetals/recipe/bismuth_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_wall.json rename to src/generated/resources/data/basemetals/recipe/bismuth_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bismuth_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/bismuth_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/blaze_rod_crushing.json b/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/blaze_rod_crushing.json rename to src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bone_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bone_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/bone_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bone_crushing.json b/src/generated/resources/data/basemetals/recipe/bone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bone_crushing.json rename to src/generated/resources/data/basemetals/recipe/bone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_arrow.json b/src/generated/resources/data/basemetals/recipe/brass_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_arrow.json rename to src/generated/resources/data/basemetals/recipe/brass_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_axe.json b/src/generated/resources/data/basemetals/recipe/brass_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_axe.json rename to src/generated/resources/data/basemetals/recipe/brass_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars.json b/src/generated/resources/data/basemetals/recipe/brass_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bars.json rename to src/generated/resources/data/basemetals/recipe/brass_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars_2.json b/src/generated/resources/data/basemetals/recipe/brass_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bars_2.json rename to src/generated/resources/data/basemetals/recipe/brass_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend.json b/src/generated/resources/data/basemetals/recipe/brass_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_blend.json rename to src/generated/resources/data/basemetals/recipe/brass_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/brass_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/brass_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/brass_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_block.json b/src/generated/resources/data/basemetals/recipe/brass_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_block.json rename to src/generated/resources/data/basemetals/recipe/brass_block.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_block_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/brass_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json b/src/generated/resources/data/basemetals/recipe/brass_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/brass_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bolt.json b/src/generated/resources/data/basemetals/recipe/brass_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bolt.json rename to src/generated/resources/data/basemetals/recipe/brass_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_boots.json b/src/generated/resources/data/basemetals/recipe/brass_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_boots.json rename to src/generated/resources/data/basemetals/recipe/brass_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/brass_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bow.json b/src/generated/resources/data/basemetals/recipe/brass_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bow.json rename to src/generated/resources/data/basemetals/recipe/brass_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_button.json b/src/generated/resources/data/basemetals/recipe/brass_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_button.json rename to src/generated/resources/data/basemetals/recipe/brass_button.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_button_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_chestplate.json b/src/generated/resources/data/basemetals/recipe/brass_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_chestplate.json rename to src/generated/resources/data/basemetals/recipe/brass_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/brass_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json b/src/generated/resources/data/basemetals/recipe/brass_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/brass_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_crossbow.json b/src/generated/resources/data/basemetals/recipe/brass_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_crossbow.json rename to src/generated/resources/data/basemetals/recipe/brass_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_door.json b/src/generated/resources/data/basemetals/recipe/brass_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_door.json rename to src/generated/resources/data/basemetals/recipe/brass_door.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_door_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json b/src/generated/resources/data/basemetals/recipe/brass_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/brass_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_gear.json b/src/generated/resources/data/basemetals/recipe/brass_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_gear.json rename to src/generated/resources/data/basemetals/recipe/brass_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_helmet.json b/src/generated/resources/data/basemetals/recipe/brass_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_helmet.json rename to src/generated/resources/data/basemetals/recipe/brass_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/brass_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_hoe.json b/src/generated/resources/data/basemetals/recipe/brass_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_hoe.json rename to src/generated/resources/data/basemetals/recipe/brass_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json b/src/generated/resources/data/basemetals/recipe/brass_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/brass_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/brass_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/brass_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_leggings.json b/src/generated/resources/data/basemetals/recipe/brass_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_leggings.json rename to src/generated/resources/data/basemetals/recipe/brass_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/brass_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_lever.json b/src/generated/resources/data/basemetals/recipe/brass_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_lever.json rename to src/generated/resources/data/basemetals/recipe/brass_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_nuggets.json b/src/generated/resources/data/basemetals/recipe/brass_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_nuggets.json rename to src/generated/resources/data/basemetals/recipe/brass_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json b/src/generated/resources/data/basemetals/recipe/brass_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/brass_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_plate.json b/src/generated/resources/data/basemetals/recipe/brass_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_plate.json rename to src/generated/resources/data/basemetals/recipe/brass_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/brass_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/brass_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/brass_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/brass_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/brass_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_rod.json b/src/generated/resources/data/basemetals/recipe/brass_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_rod.json rename to src/generated/resources/data/basemetals/recipe/brass_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_scythe.json b/src/generated/resources/data/basemetals/recipe/brass_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_scythe.json rename to src/generated/resources/data/basemetals/recipe/brass_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_shears.json b/src/generated/resources/data/basemetals/recipe/brass_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_shears.json rename to src/generated/resources/data/basemetals/recipe/brass_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_shield.json b/src/generated/resources/data/basemetals/recipe/brass_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_shield.json rename to src/generated/resources/data/basemetals/recipe/brass_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/brass_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_shovel.json b/src/generated/resources/data/basemetals/recipe/brass_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_shovel.json rename to src/generated/resources/data/basemetals/recipe/brass_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_slab.json b/src/generated/resources/data/basemetals/recipe/brass_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_slab.json rename to src/generated/resources/data/basemetals/recipe/brass_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallblend.json b/src/generated/resources/data/basemetals/recipe/brass_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_smallblend.json rename to src/generated/resources/data/basemetals/recipe/brass_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/brass_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json b/src/generated/resources/data/basemetals/recipe/brass_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/brass_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/brass_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_stairs.json b/src/generated/resources/data/basemetals/recipe/brass_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_stairs.json rename to src/generated/resources/data/basemetals/recipe/brass_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_sword.json b/src/generated/resources/data/basemetals/recipe/brass_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_sword.json rename to src/generated/resources/data/basemetals/recipe/brass_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json b/src/generated/resources/data/basemetals/recipe/brass_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/brass_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_wall.json b/src/generated/resources/data/basemetals/recipe/brass_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_wall.json rename to src/generated/resources/data/basemetals/recipe/brass_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/brass_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/brass_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/brass_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_arrow.json b/src/generated/resources/data/basemetals/recipe/bronze_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_arrow.json rename to src/generated/resources/data/basemetals/recipe/bronze_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_axe.json b/src/generated/resources/data/basemetals/recipe/bronze_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_axe.json rename to src/generated/resources/data/basemetals/recipe/bronze_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars.json b/src/generated/resources/data/basemetals/recipe/bronze_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bars.json rename to src/generated/resources/data/basemetals/recipe/bronze_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json b/src/generated/resources/data/basemetals/recipe/bronze_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bars_2.json rename to src/generated/resources/data/basemetals/recipe/bronze_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend.json b/src/generated/resources/data/basemetals/recipe/bronze_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_blend.json rename to src/generated/resources/data/basemetals/recipe/bronze_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/bronze_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/bronze_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/bronze_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block.json b/src/generated/resources/data/basemetals/recipe/bronze_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_block.json rename to src/generated/resources/data/basemetals/recipe/bronze_block.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json b/src/generated/resources/data/basemetals/recipe/bronze_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/bronze_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bolt.json b/src/generated/resources/data/basemetals/recipe/bronze_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bolt.json rename to src/generated/resources/data/basemetals/recipe/bronze_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_boots.json b/src/generated/resources/data/basemetals/recipe/bronze_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_boots.json rename to src/generated/resources/data/basemetals/recipe/bronze_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bronze_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bow.json b/src/generated/resources/data/basemetals/recipe/bronze_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bow.json rename to src/generated/resources/data/basemetals/recipe/bronze_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_button.json b/src/generated/resources/data/basemetals/recipe/bronze_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_button.json rename to src/generated/resources/data/basemetals/recipe/bronze_button.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_button_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json b/src/generated/resources/data/basemetals/recipe/bronze_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_chestplate.json rename to src/generated/resources/data/basemetals/recipe/bronze_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bronze_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json b/src/generated/resources/data/basemetals/recipe/bronze_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/bronze_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json b/src/generated/resources/data/basemetals/recipe/bronze_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_crossbow.json rename to src/generated/resources/data/basemetals/recipe/bronze_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_door.json b/src/generated/resources/data/basemetals/recipe/bronze_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_door.json rename to src/generated/resources/data/basemetals/recipe/bronze_door.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_door_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json b/src/generated/resources/data/basemetals/recipe/bronze_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/bronze_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_gear.json b/src/generated/resources/data/basemetals/recipe/bronze_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_gear.json rename to src/generated/resources/data/basemetals/recipe/bronze_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_helmet.json b/src/generated/resources/data/basemetals/recipe/bronze_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_helmet.json rename to src/generated/resources/data/basemetals/recipe/bronze_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bronze_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_hoe.json b/src/generated/resources/data/basemetals/recipe/bronze_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_hoe.json rename to src/generated/resources/data/basemetals/recipe/bronze_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json b/src/generated/resources/data/basemetals/recipe/bronze_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/bronze_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/bronze_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/bronze_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_leggings.json b/src/generated/resources/data/basemetals/recipe/bronze_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_leggings.json rename to src/generated/resources/data/basemetals/recipe/bronze_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bronze_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_lever.json b/src/generated/resources/data/basemetals/recipe/bronze_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_lever.json rename to src/generated/resources/data/basemetals/recipe/bronze_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json b/src/generated/resources/data/basemetals/recipe/bronze_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_nuggets.json rename to src/generated/resources/data/basemetals/recipe/bronze_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json b/src/generated/resources/data/basemetals/recipe/bronze_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/bronze_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_plate.json b/src/generated/resources/data/basemetals/recipe/bronze_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_plate.json rename to src/generated/resources/data/basemetals/recipe/bronze_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/bronze_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/bronze_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/bronze_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/bronze_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_rod.json b/src/generated/resources/data/basemetals/recipe/bronze_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_rod.json rename to src/generated/resources/data/basemetals/recipe/bronze_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_scythe.json b/src/generated/resources/data/basemetals/recipe/bronze_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_scythe.json rename to src/generated/resources/data/basemetals/recipe/bronze_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shears.json b/src/generated/resources/data/basemetals/recipe/bronze_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_shears.json rename to src/generated/resources/data/basemetals/recipe/bronze_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shield.json b/src/generated/resources/data/basemetals/recipe/bronze_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_shield.json rename to src/generated/resources/data/basemetals/recipe/bronze_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/bronze_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shovel.json b/src/generated/resources/data/basemetals/recipe/bronze_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_shovel.json rename to src/generated/resources/data/basemetals/recipe/bronze_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_slab.json b/src/generated/resources/data/basemetals/recipe/bronze_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_slab.json rename to src/generated/resources/data/basemetals/recipe/bronze_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json b/src/generated/resources/data/basemetals/recipe/bronze_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_smallblend.json rename to src/generated/resources/data/basemetals/recipe/bronze_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/bronze_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json b/src/generated/resources/data/basemetals/recipe/bronze_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/bronze_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/bronze_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_stairs.json b/src/generated/resources/data/basemetals/recipe/bronze_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_stairs.json rename to src/generated/resources/data/basemetals/recipe/bronze_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_sword.json b/src/generated/resources/data/basemetals/recipe/bronze_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_sword.json rename to src/generated/resources/data/basemetals/recipe/bronze_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json b/src/generated/resources/data/basemetals/recipe/bronze_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/bronze_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_wall.json b/src/generated/resources/data/basemetals/recipe/bronze_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_wall.json rename to src/generated/resources/data/basemetals/recipe/bronze_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/bronze_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/bronze_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/bronze_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block.json b/src/generated/resources/data/basemetals/recipe/charcoal_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_block.json rename to src/generated/resources/data/basemetals/recipe/charcoal_block.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json b/src/generated/resources/data/basemetals/recipe/charcoal_block_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json rename to src/generated/resources/data/basemetals/recipe/charcoal_block_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_crushing.json rename to src/generated/resources/data/basemetals/recipe/charcoal_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json b/src/generated/resources/data/basemetals/recipe/charcoal_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_ingot.json rename to src/generated/resources/data/basemetals/recipe/charcoal_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json b/src/generated/resources/data/basemetals/recipe/charcoal_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_nugget.json rename to src/generated/resources/data/basemetals/recipe/charcoal_nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/charcoal_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/charcoal_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/recipe/charcoal_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/charcoal_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_block_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/coal_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_block_dust.json b/src/generated/resources/data/basemetals/recipe/coal_block_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_block_dust.json rename to src/generated/resources/data/basemetals/recipe/coal_block_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_crushing.json rename to src/generated/resources/data/basemetals/recipe/coal_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_ingot.json b/src/generated/resources/data/basemetals/recipe/coal_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_ingot.json rename to src/generated/resources/data/basemetals/recipe/coal_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_nugget.json b/src/generated/resources/data/basemetals/recipe/coal_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_nugget.json rename to src/generated/resources/data/basemetals/recipe/coal_nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/coal_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/coal_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json b/src/generated/resources/data/basemetals/recipe/coal_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coal_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/coal_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cobblestone_crushing.json rename to src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cobblestone_wall_crushing.json rename to src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json b/src/generated/resources/data/basemetals/recipe/coldiron_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_arrow.json rename to src/generated/resources/data/basemetals/recipe/coldiron_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_axe.json b/src/generated/resources/data/basemetals/recipe/coldiron_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_axe.json rename to src/generated/resources/data/basemetals/recipe/coldiron_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars.json b/src/generated/resources/data/basemetals/recipe/coldiron_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bars.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json b/src/generated/resources/data/basemetals/recipe/coldiron_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block.json b/src/generated/resources/data/basemetals/recipe/coldiron_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_block.json rename to src/generated/resources/data/basemetals/recipe/coldiron_block.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/recipe/coldiron_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/coldiron_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json b/src/generated/resources/data/basemetals/recipe/coldiron_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bolt.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_boots.json b/src/generated/resources/data/basemetals/recipe/coldiron_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_boots.json rename to src/generated/resources/data/basemetals/recipe/coldiron_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/coldiron_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bow.json b/src/generated/resources/data/basemetals/recipe/coldiron_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bow.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_button.json b/src/generated/resources/data/basemetals/recipe/coldiron_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_button.json rename to src/generated/resources/data/basemetals/recipe/coldiron_button.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_button_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json rename to src/generated/resources/data/basemetals/recipe/coldiron_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/coldiron_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/coldiron_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json b/src/generated/resources/data/basemetals/recipe/coldiron_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json rename to src/generated/resources/data/basemetals/recipe/coldiron_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_door.json b/src/generated/resources/data/basemetals/recipe/coldiron_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_door.json rename to src/generated/resources/data/basemetals/recipe/coldiron_door.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_door_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/recipe/coldiron_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/coldiron_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_gear.json b/src/generated/resources/data/basemetals/recipe/coldiron_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_gear.json rename to src/generated/resources/data/basemetals/recipe/coldiron_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json b/src/generated/resources/data/basemetals/recipe/coldiron_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_helmet.json rename to src/generated/resources/data/basemetals/recipe/coldiron_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/coldiron_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json b/src/generated/resources/data/basemetals/recipe/coldiron_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_hoe.json rename to src/generated/resources/data/basemetals/recipe/coldiron_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/recipe/coldiron_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/coldiron_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/coldiron_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json b/src/generated/resources/data/basemetals/recipe/coldiron_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_leggings.json rename to src/generated/resources/data/basemetals/recipe/coldiron_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/coldiron_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_lever.json b/src/generated/resources/data/basemetals/recipe/coldiron_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_lever.json rename to src/generated/resources/data/basemetals/recipe/coldiron_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json b/src/generated/resources/data/basemetals/recipe/coldiron_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json rename to src/generated/resources/data/basemetals/recipe/coldiron_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/coldiron_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/coldiron_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/coldiron_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_plate.json b/src/generated/resources/data/basemetals/recipe/coldiron_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_plate.json rename to src/generated/resources/data/basemetals/recipe/coldiron_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/coldiron_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/coldiron_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/coldiron_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/coldiron_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/coldiron_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_rod.json b/src/generated/resources/data/basemetals/recipe/coldiron_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_rod.json rename to src/generated/resources/data/basemetals/recipe/coldiron_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json b/src/generated/resources/data/basemetals/recipe/coldiron_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_scythe.json rename to src/generated/resources/data/basemetals/recipe/coldiron_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shears.json b/src/generated/resources/data/basemetals/recipe/coldiron_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_shears.json rename to src/generated/resources/data/basemetals/recipe/coldiron_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shield.json b/src/generated/resources/data/basemetals/recipe/coldiron_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_shield.json rename to src/generated/resources/data/basemetals/recipe/coldiron_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/coldiron_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json b/src/generated/resources/data/basemetals/recipe/coldiron_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_shovel.json rename to src/generated/resources/data/basemetals/recipe/coldiron_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_slab.json b/src/generated/resources/data/basemetals/recipe/coldiron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_slab.json rename to src/generated/resources/data/basemetals/recipe/coldiron_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/coldiron_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/coldiron_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json b/src/generated/resources/data/basemetals/recipe/coldiron_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_stairs.json rename to src/generated/resources/data/basemetals/recipe/coldiron_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_sword.json b/src/generated/resources/data/basemetals/recipe/coldiron_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_sword.json rename to src/generated/resources/data/basemetals/recipe/coldiron_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/coldiron_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_wall.json b/src/generated/resources/data/basemetals/recipe/coldiron_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_wall.json rename to src/generated/resources/data/basemetals/recipe/coldiron_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/coldiron_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/coldiron_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/adamantine/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/adamantine/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/adamantine/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/adamantine/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/aquarium.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/aquarium.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/aquarium.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/aquarium.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/brass.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/brass.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/brass.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/brass.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/bronze.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/bronze.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/bronze.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/bronze.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/cupronickel.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/cupronickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/cupronickel.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/cupronickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/electrum.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/electrum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/electrum.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/electrum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/invar.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/invar.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/invar.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/invar.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/mithril.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/mithril.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/mithril.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/mithril.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/pewter.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/pewter.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/pewter.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/pewter.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/steel.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/steel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/steel.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/alloys/steel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/antimony/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/antimony/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/antimony/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/antimony/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/aquarium/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/aquarium/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/aquarium/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/aquarium/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/bismuth/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/bismuth/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/bismuth/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/bismuth/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/brass/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/brass/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/brass/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/brass/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/bronze/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/bronze/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/bronze/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/bronze/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/coldiron/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/coldiron/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/coldiron/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/coldiron/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/copper/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/copper/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/copper/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/copper/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/cupronickel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/cupronickel/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/cupronickel/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/cupronickel/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/electrum/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/electrum/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/electrum/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/electrum/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/invar/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/invar/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/invar/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/invar/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/lead/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/lead/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/lead/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/lead/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/mercury/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/mercury/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/mercury/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/mercury/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/mithril/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/mithril/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/mithril/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/mithril/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/nickel/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/nickel/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/nickel/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/nickel/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/pewter/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/pewter/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/pewter/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/pewter/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/platinum/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/platinum/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/platinum/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/platinum/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/silver/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/silver/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/silver/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/silver/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/starsteel/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/starsteel/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/starsteel/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/starsteel/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/steel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/steel/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/steel/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/steel/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/tin/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/tin/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/tin/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/tin/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/zinc/ingot_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ingot_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/zinc/ingot_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipe/compat/enderio/zinc/ore_sag_milling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ore_sag_milling.json rename to src/generated/resources/data/basemetals/recipe/compat/enderio/zinc/ore_sag_milling.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/adamantine/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/antimony/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/bismuth/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/coldiron/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/nickel/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/platinum/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/starsteel/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/clean_slurry_to_crystal.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clean_slurry_to_crystal.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/clean_slurry_to_crystal.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/clump_to_dirty_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clump_to_dirty_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/clump_to_dirty_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/crystal_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/crystal_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/crystal_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/dirty_dust_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_dust_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/dirty_dust_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ingot_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ingot_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ingot_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_dirty_slurry.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dirty_slurry.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_dirty_slurry.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dust.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_dust.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dust.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_dust.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_shard.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_shard.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_shard.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/ore_to_shard.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/shard_to_clump.json b/src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/shard_to_clump.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/shard_to_clump.json rename to src/generated/resources/data/basemetals/recipe/compat/mekanism/zinc/shard_to_clump.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/aquarium.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/aquarium.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/aquarium.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/aquarium.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/brass.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/brass.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/brass.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/brass.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/bronze.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/bronze.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/bronze.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/bronze.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/cupronickel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/cupronickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/cupronickel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/cupronickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/electrum.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/electrum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/electrum.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/electrum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/invar.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/invar.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/invar.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/invar.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/mithril.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/mithril.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/mithril.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/mithril.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/pewter.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/pewter.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/pewter.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/alloys/pewter.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/adamantine/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/antimony/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/aquarium/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bismuth/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/brass/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/bronze/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/coldiron/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/block.json similarity index 91% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/block.json index 2364e66da..a45e0d2de 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json +++ b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/block.json @@ -19,6 +19,6 @@ ] }, "result": { - "item": "basemetals:copper_block" + "item": "minecraft:copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/ingot_gold_cast.json similarity index 92% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/ingot_gold_cast.json index 9612cb92d..6505c715f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/ingot_gold_cast.json @@ -22,6 +22,6 @@ ] }, "result": { - "item": "basemetals:copper_ingot" + "item": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/ingot_sand_cast.json similarity index 92% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/ingot_sand_cast.json index 18f91cae6..ee2f89cdf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/ingot_sand_cast.json @@ -23,6 +23,6 @@ ] }, "result": { - "item": "basemetals:copper_ingot" + "item": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/cupronickel/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/electrum/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/invar/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/lead/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/mithril/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/nickel/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/pewter/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/platinum/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/silver/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/starsteel/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/steel/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/tin/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/gear_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/gear_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/gear_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/gear_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/ingot_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/ingot_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/ingot_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/ingot_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/nugget_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/nugget_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/nugget_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/nugget_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/plate_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/plate_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/plate_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/plate_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/rod_gold_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_gold_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/rod_gold_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/rod_sand_cast.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_sand_cast.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/zinc/rod_sand_cast.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/adamantine/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/adamantine/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/adamantine/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/adamantine/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/adamantine/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/adamantine/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/antimony/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/antimony/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/antimony/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/antimony/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/antimony/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/antimony/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/aquarium/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/aquarium/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/aquarium/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/aquarium/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/aquarium/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/aquarium/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bismuth/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bismuth/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bismuth/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bismuth/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bismuth/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bismuth/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/brass/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/brass/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/brass/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/brass/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/brass/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/brass/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bronze/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bronze/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bronze/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bronze/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bronze/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/bronze/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/adamantine.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/adamantine.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/adamantine.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/adamantine.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/antimony.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/antimony.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/antimony.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/antimony.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/aquarium.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/aquarium.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/aquarium.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/aquarium.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bismuth.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/bismuth.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bismuth.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/bismuth.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/brass.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/brass.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/brass.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/brass.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bronze.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/bronze.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bronze.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/bronze.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/coldiron.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/coldiron.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/coldiron.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/coldiron.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/copper.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/copper.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/copper.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/copper.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/cupronickel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/cupronickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/cupronickel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/cupronickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/electrum.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/electrum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/electrum.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/electrum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/invar.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/invar.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/invar.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/invar.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/lead.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/lead.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/lead.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/lead.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/mithril.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/mithril.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/mithril.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/mithril.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/nickel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/nickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/nickel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/nickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/pewter.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/pewter.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/pewter.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/pewter.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/platinum.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/platinum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/platinum.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/platinum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/silver.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/silver.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/silver.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/silver.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/starsteel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/starsteel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/starsteel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/starsteel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/steel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/steel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/steel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/steel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/tin.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/tin.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/tin.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/tin.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/zinc.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/zinc.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/zinc.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/casting/zinc.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/coldiron/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/coldiron/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/coldiron/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/coldiron/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/coldiron/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/coldiron/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/copper/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/copper/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/copper/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/copper/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/copper/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/copper/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/cupronickel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/cupronickel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/cupronickel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/cupronickel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/cupronickel/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/cupronickel/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/electrum/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/electrum/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/electrum/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/electrum/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/electrum/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/electrum/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/invar/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/invar/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/invar/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/invar/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/invar/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/invar/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/lead/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/lead/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/lead/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/lead/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/lead/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/lead/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/adamantine.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/adamantine.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/adamantine.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/adamantine.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/antimony.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/antimony.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/antimony.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/antimony.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/aquarium.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/aquarium.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/aquarium.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/aquarium.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bismuth.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/bismuth.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bismuth.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/bismuth.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/brass.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/brass.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/brass.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/brass.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bronze.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/bronze.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bronze.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/bronze.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/coldiron.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/coldiron.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/coldiron.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/coldiron.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/copper.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/copper.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/copper.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/copper.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/cupronickel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/cupronickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/cupronickel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/cupronickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/electrum.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/electrum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/electrum.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/electrum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/invar.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/invar.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/invar.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/invar.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/lead.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/lead.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/lead.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/lead.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/mithril.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/mithril.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/mithril.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/mithril.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/nickel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/nickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/nickel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/nickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/pewter.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/pewter.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/pewter.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/pewter.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/platinum.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/platinum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/platinum.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/platinum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/silver.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/silver.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/silver.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/silver.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/starsteel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/starsteel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/starsteel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/starsteel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/steel.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/steel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/steel.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/steel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/tin.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/tin.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/tin.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/tin.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/zinc.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/zinc.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/zinc.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/melting/zinc.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/mithril/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/mithril/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/mithril/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/mithril/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/mithril/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/mithril/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/nickel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/nickel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/nickel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/nickel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/nickel/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/nickel/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/pewter/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/pewter/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/pewter/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/pewter/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/pewter/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/pewter/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/platinum/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/platinum/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/platinum/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/platinum/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/platinum/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/platinum/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/silver/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/silver/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/silver/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/silver/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/silver/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/silver/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/starsteel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/starsteel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/starsteel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/starsteel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/starsteel/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/starsteel/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/steel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/steel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/steel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/steel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/steel/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/steel/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/tin/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/tin/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/tin/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/tin/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/tin/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/tin/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/zinc/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/zinc/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/zinc/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/zinc/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/storage_blocks.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/zinc/storage_blocks.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/storage_blocks.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/materials/zinc/storage_blocks.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/adamantine/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/antimony/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/aquarium/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bismuth/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/brass/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/bronze/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/coldiron/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/copper/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/cupronickel/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/electrum/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/invar/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/lead/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mercury/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mercury/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mercury/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mercury/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/mithril/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/nickel/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/pewter/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/platinum/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/silver/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/starsteel/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/steel/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/tin/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/block.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/block.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/block.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/gear.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/gear.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/gear.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/ingot.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/ingot.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/nugget.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/nugget.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/plate.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/plate.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/plate.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/rod.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/rod.json rename to src/generated/resources/data/basemetals/recipe/compat/tconstruct/melting/zinc/rod.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/adamantine/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/aquarium.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/aquarium.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/aquarium.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/aquarium.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/brass.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/brass.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/brass.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/brass.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/bronze.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/bronze.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/bronze.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/bronze.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/cupronickel.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/cupronickel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/cupronickel.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/cupronickel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/electrum.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/electrum.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/electrum.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/electrum.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/invar.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/invar.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/invar.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/invar.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/mithril.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/mithril.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/mithril.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/mithril.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/pewter.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/pewter.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/pewter.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/pewter.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/steel.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/steel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/steel.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/alloys/steel.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/antimony/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/aquarium/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bismuth/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/brass/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/brass/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/brass/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/brass/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/brass/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/brass/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/brass/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/brass/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/brass/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/brass/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/brass/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/brass/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/brass/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/bronze/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/coldiron/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/dust_furnace.json similarity index 90% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/copper/dust_furnace.json index d371d6977..f92568047 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/dust_furnace.json @@ -19,7 +19,7 @@ }, "result": [ { - "item": "basemetals:copper_ingot" + "item": "minecraft:copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/copper/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/copper/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/copper/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/copper/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/copper/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/copper/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/copper/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/copper/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/cupronickel/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/electrum/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/invar/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/invar/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/invar/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/invar/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/invar/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/invar/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/invar/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/invar/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/invar/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/invar/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/invar/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/invar/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/invar/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/lead/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/lead/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/lead/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/lead/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/lead/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/lead/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/lead/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/lead/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/lead/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/lead/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/lead/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/lead/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/lead/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/lead/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/lead/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mercury/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/mithril/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/nickel/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/pewter/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/platinum/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/silver/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/silver/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/silver/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/silver/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/silver/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/silver/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/silver/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/silver/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/silver/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/silver/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/silver/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/silver/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/silver/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/silver/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/silver/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/starsteel/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/steel/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/steel/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/steel/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/steel/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/steel/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/steel/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/steel/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/steel/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/steel/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/steel/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/steel/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/steel/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/steel/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/tin/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/tin/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/tin/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/tin/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/tin/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/tin/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/tin/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/tin/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/tin/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/tin/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/tin/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/tin/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/tin/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/tin/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/tin/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/dust_furnace.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/dust_furnace.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/dust_furnace.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/dust_furnace.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/gear_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/gear_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/gear_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/gear_press.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_crucible.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/ingot_crucible.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_crucible.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/ingot_crucible.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/ingot_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/ingot_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/ore_pulverizing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ore_pulverizing.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/ore_pulverizing.json diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/plate_press.json b/src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/plate_press.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/plate_press.json rename to src/generated/resources/data/basemetals/recipe/compat/thermal/zinc/plate_press.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_arrow.json b/src/generated/resources/data/basemetals/recipe/copper_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_arrow.json rename to src/generated/resources/data/basemetals/recipe/copper_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_axe.json b/src/generated/resources/data/basemetals/recipe/copper_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_axe.json rename to src/generated/resources/data/basemetals/recipe/copper_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json index c71fdf1e2..3fa1cc920 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars.json b/src/generated/resources/data/basemetals/recipe/copper_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_bars.json rename to src/generated/resources/data/basemetals/recipe/copper_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars_2.json b/src/generated/resources/data/basemetals/recipe/copper_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_bars_2.json rename to src/generated/resources/data/basemetals/recipe/copper_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json b/src/generated/resources/data/basemetals/recipe/copper_block.json similarity index 69% rename from src/generated/resources/data/basemetals/recipes/copper_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/copper_block.json index 617ec2691..a4a04771c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/copper_block.json @@ -3,18 +3,19 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_trapdoor", + "group": "minecraft:copper_block", "key": { "X": { "tag": "forge:ingots/copper" } }, "pattern": [ - "XX", - "XX" + "XXX", + "XXX", + "XXX" ], "result": { - "id": "basemetals:copper_trapdoor" + "id": "minecraft:copper_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_block_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/copper_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json b/src/generated/resources/data/basemetals/recipe/copper_block_ingot.json similarity index 63% rename from src/generated/resources/data/basemetals/recipes/copper_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/copper_block_ingot.json index 5a42d9913..4ded1be8d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/copper_block_ingot.json @@ -3,15 +3,15 @@ "recipe": { "type": "minecraft:crafting_shapeless", "category": "misc", - "group": "basemetals:copper_ingot", + "group": "minecraft:copper_ingot", "ingredients": [ { - "item": "basemetals:copper_block" + "tag": "forge:storage_blocks/copper" } ], "result": { "count": 9, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bolt.json b/src/generated/resources/data/basemetals/recipe/copper_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_bolt.json rename to src/generated/resources/data/basemetals/recipe/copper_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_boots.json b/src/generated/resources/data/basemetals/recipe/copper_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_boots.json rename to src/generated/resources/data/basemetals/recipe/copper_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/copper_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json index 950d3de73..41721eae8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bow.json b/src/generated/resources/data/basemetals/recipe/copper_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_bow.json rename to src/generated/resources/data/basemetals/recipe/copper_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json similarity index 81% rename from src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json index f472f6877..33b5f1264 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_bow" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_button.json b/src/generated/resources/data/basemetals/recipe/copper_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_button.json rename to src/generated/resources/data/basemetals/recipe/copper_button.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_button_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_chestplate.json b/src/generated/resources/data/basemetals/recipe/copper_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_chestplate.json rename to src/generated/resources/data/basemetals/recipe/copper_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/copper_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json index 3555c81bd..adf20fd6a 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json b/src/generated/resources/data/basemetals/recipe/copper_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/copper_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json similarity index 82% rename from src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json index 066667ed8..7ef0cc465 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_crackhammer" }, "result": { - "id": "basemetals:copper_block" + "id": "minecraft:copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_crossbow.json b/src/generated/resources/data/basemetals/recipe/copper_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_crossbow.json rename to src/generated/resources/data/basemetals/recipe/copper_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json index aff66cad8..0561305b6 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_door.json b/src/generated/resources/data/basemetals/recipe/copper_door.json similarity index 80% rename from src/generated/resources/data/basemetals/recipes/copper_door.json rename to src/generated/resources/data/basemetals/recipe/copper_door.json index 8049dd7c1..829a37158 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_door.json +++ b/src/generated/resources/data/basemetals/recipe/copper_door.json @@ -3,7 +3,7 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_door", + "group": "minecraft:copper_door", "key": { "X": { "tag": "forge:ingots/copper" @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "id": "basemetals:copper_door" + "id": "minecraft:copper_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_door_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_door_recycling.json similarity index 66% rename from src/generated/resources/data/basemetals/recipes/copper_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_door_recycling.json index af187cd28..5834f5548 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_door_recycling.json @@ -3,10 +3,10 @@ "cookingtime": 200, "experience": 0.5, "ingredient": { - "item": "basemetals:copper_door" + "tag": "forge:doors/copper" }, "result": { "count": 2, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json b/src/generated/resources/data/basemetals/recipe/copper_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/copper_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_gear.json b/src/generated/resources/data/basemetals/recipe/copper_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_gear.json rename to src/generated/resources/data/basemetals/recipe/copper_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json similarity index 82% rename from src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json index b93bf15a6..dea2a988d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_gear" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_helmet.json b/src/generated/resources/data/basemetals/recipe/copper_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_helmet.json rename to src/generated/resources/data/basemetals/recipe/copper_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/copper_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json index f355fc5a5..27160ca67 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_hoe.json b/src/generated/resources/data/basemetals/recipe/copper_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_hoe.json rename to src/generated/resources/data/basemetals/recipe/copper_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json index bed7c84aa..37660d606 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json b/src/generated/resources/data/basemetals/recipe/copper_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/copper_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json similarity index 79% rename from src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json index d2d6d8be6..aef3e87ca 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json @@ -3,7 +3,7 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "misc", - "group": "basemetals:copper_ingot", + "group": "minecraft:copper_ingot", "key": { "X": { "item": "basemetals:copper_nugget" @@ -15,7 +15,7 @@ "XXX" ], "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_leggings.json b/src/generated/resources/data/basemetals/recipe/copper_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_leggings.json rename to src/generated/resources/data/basemetals/recipe/copper_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/copper_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json index 1ec9e356b..d95414666 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_lever.json b/src/generated/resources/data/basemetals/recipe/copper_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_lever.json rename to src/generated/resources/data/basemetals/recipe/copper_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json similarity index 82% rename from src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json index cf2c3c884..93e330861 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_lever" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_nuggets.json b/src/generated/resources/data/basemetals/recipe/copper_nuggets.json similarity index 87% rename from src/generated/resources/data/basemetals/recipes/copper_nuggets.json rename to src/generated/resources/data/basemetals/recipe/copper_nuggets.json index 9eb3a58f3..9c63a394b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/copper_nuggets.json @@ -6,7 +6,7 @@ "group": "basemetals:copper_nugget", "ingredients": [ { - "item": "basemetals:copper_ingot" + "tag": "forge:ingots/copper" } ], "result": { diff --git a/src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json similarity index 80% rename from src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json index b4732b8a4..8a7430f4b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json @@ -6,6 +6,6 @@ "tag": "forge:ores/copper" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json similarity index 80% rename from src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json index 62d840a25..1818aeb3b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json @@ -6,6 +6,6 @@ "tag": "forge:ores/copper" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json b/src/generated/resources/data/basemetals/recipe/copper_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/copper_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json index 3264c4b33..d8ca7590c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_plate.json b/src/generated/resources/data/basemetals/recipe/copper_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_plate.json rename to src/generated/resources/data/basemetals/recipe/copper_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json similarity index 82% rename from src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json index edaaa047e..16f4c45d8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_plate" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/copper_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/copper_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json similarity index 80% rename from src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json index 3fcbe4901..9fd144626 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json @@ -6,6 +6,6 @@ "tag": "forge:dusts/copper" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/copper_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json similarity index 84% rename from src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json index f6e4131db..ce9ab2282 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_rod.json b/src/generated/resources/data/basemetals/recipe/copper_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_rod.json rename to src/generated/resources/data/basemetals/recipe/copper_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_scythe.json b/src/generated/resources/data/basemetals/recipe/copper_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_scythe.json rename to src/generated/resources/data/basemetals/recipe/copper_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_shears.json b/src/generated/resources/data/basemetals/recipe/copper_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_shears.json rename to src/generated/resources/data/basemetals/recipe/copper_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json index f0c975f25..67888fff5 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_shield.json b/src/generated/resources/data/basemetals/recipe/copper_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_shield.json rename to src/generated/resources/data/basemetals/recipe/copper_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/copper_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_shovel.json b/src/generated/resources/data/basemetals/recipe/copper_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_shovel.json rename to src/generated/resources/data/basemetals/recipe/copper_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json similarity index 82% rename from src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json index f50cce6b0..a5d6827c9 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_shovel" }, "result": { - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_slab.json b/src/generated/resources/data/basemetals/recipe/copper_slab.json similarity index 78% rename from src/generated/resources/data/basemetals/recipes/copper_slab.json rename to src/generated/resources/data/basemetals/recipe/copper_slab.json index 955a8d03c..e0a6899af 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_slab.json +++ b/src/generated/resources/data/basemetals/recipe/copper_slab.json @@ -3,7 +3,7 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_slab", + "group": "minecraft:cut_copper_slab", "key": { "X": { "tag": "forge:storage_blocks/copper" @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "id": "basemetals:copper_slab" + "id": "minecraft:cut_copper_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json index 3fa96b9b3..eb69d0114 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json @@ -3,7 +3,7 @@ "cookingtime": 200, "experience": 0.06, "ingredient": { - "item": "basemetals:copper_slab" + "tag": "forge:slabs/copper" }, "result": { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json b/src/generated/resources/data/basemetals/recipe/copper_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/copper_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/copper_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/copper_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_stairs.json b/src/generated/resources/data/basemetals/recipe/copper_stairs.json similarity index 78% rename from src/generated/resources/data/basemetals/recipes/copper_stairs.json rename to src/generated/resources/data/basemetals/recipe/copper_stairs.json index 1e290036a..e4a282782 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/copper_stairs.json @@ -3,7 +3,7 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_stairs", + "group": "minecraft:cut_copper_stairs", "key": { "X": { "tag": "forge:storage_blocks/copper" @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "id": "basemetals:copper_stairs" + "id": "minecraft:cut_copper_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_sword.json b/src/generated/resources/data/basemetals/recipe/copper_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_sword.json rename to src/generated/resources/data/basemetals/recipe/copper_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json index ff473f15b..e65a0e265 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_block.json b/src/generated/resources/data/basemetals/recipe/copper_trapdoor.json similarity index 63% rename from src/generated/resources/data/basemetals/recipes/copper_block.json rename to src/generated/resources/data/basemetals/recipe/copper_trapdoor.json index 2daeb772e..0fddc5194 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block.json +++ b/src/generated/resources/data/basemetals/recipe/copper_trapdoor.json @@ -3,19 +3,19 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_block", + "group": "minecraft:copper_trapdoor", "key": { "X": { - "item": "basemetals:copper_ingot" + "tag": "forge:ingots/copper" } }, "pattern": [ - "XXX", "XXX", "XXX" ], "result": { - "id": "basemetals:copper_block" + "count": 2, + "id": "minecraft:copper_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json similarity index 83% rename from src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json index e1b69c519..645e52afb 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "id": "basemetals:copper_ingot" + "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_wall.json b/src/generated/resources/data/basemetals/recipe/copper_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/copper_wall.json rename to src/generated/resources/data/basemetals/recipe/copper_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json similarity index 82% rename from src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json index 6ea26e3d5..b72e41cfb 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_wall" }, "result": { - "id": "basemetals:copper_block" + "id": "minecraft:copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json b/src/generated/resources/data/basemetals/recipe/cupronickel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_axe.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bars.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json b/src/generated/resources/data/basemetals/recipe/cupronickel_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_blend.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/cupronickel_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_block.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_block.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json b/src/generated/resources/data/basemetals/recipe/cupronickel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_boots.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bow.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_button.json b/src/generated/resources/data/basemetals/recipe/cupronickel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_button.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_button.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_door.json b/src/generated/resources/data/basemetals/recipe/cupronickel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_door.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_door.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/cupronickel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json b/src/generated/resources/data/basemetals/recipe/cupronickel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_gear.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/cupronickel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json b/src/generated/resources/data/basemetals/recipe/cupronickel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_lever.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/recipe/cupronickel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json b/src/generated/resources/data/basemetals/recipe/cupronickel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_plate.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/cupronickel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json b/src/generated/resources/data/basemetals/recipe/cupronickel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_rod.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_shears.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_shield.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json b/src/generated/resources/data/basemetals/recipe/cupronickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_slab.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json b/src/generated/resources/data/basemetals/recipe/cupronickel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json b/src/generated/resources/data/basemetals/recipe/cupronickel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_sword.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json b/src/generated/resources/data/basemetals/recipe/cupronickel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_wall.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/cupronickel_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/cupronickel_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/dark_prismarine_crushing.json b/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/dark_prismarine_crushing.json rename to src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/detector_rail.json b/src/generated/resources/data/basemetals/recipe/detector_rail.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/detector_rail.json rename to src/generated/resources/data/basemetals/recipe/detector_rail.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_arrow.json b/src/generated/resources/data/basemetals/recipe/diamond_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_arrow.json rename to src/generated/resources/data/basemetals/recipe/diamond_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars.json b/src/generated/resources/data/basemetals/recipe/diamond_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bars.json rename to src/generated/resources/data/basemetals/recipe/diamond_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json b/src/generated/resources/data/basemetals/recipe/diamond_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bars_2.json rename to src/generated/resources/data/basemetals/recipe/diamond_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_block_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bolt.json b/src/generated/resources/data/basemetals/recipe/diamond_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bolt.json rename to src/generated/resources/data/basemetals/recipe/diamond_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bow.json b/src/generated/resources/data/basemetals/recipe/diamond_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bow.json rename to src/generated/resources/data/basemetals/recipe/diamond_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_button.json b/src/generated/resources/data/basemetals/recipe/diamond_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_button.json rename to src/generated/resources/data/basemetals/recipe/diamond_button.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_button_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json b/src/generated/resources/data/basemetals/recipe/diamond_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/diamond_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json b/src/generated/resources/data/basemetals/recipe/diamond_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_crossbow.json rename to src/generated/resources/data/basemetals/recipe/diamond_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_crushing.json rename to src/generated/resources/data/basemetals/recipe/diamond_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_door.json b/src/generated/resources/data/basemetals/recipe/diamond_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_door.json rename to src/generated/resources/data/basemetals/recipe/diamond_door.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_door_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json b/src/generated/resources/data/basemetals/recipe/diamond_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/diamond_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_gear.json b/src/generated/resources/data/basemetals/recipe/diamond_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_gear.json rename to src/generated/resources/data/basemetals/recipe/diamond_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_lever.json b/src/generated/resources/data/basemetals/recipe/diamond_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_lever.json rename to src/generated/resources/data/basemetals/recipe/diamond_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/diamond_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/diamond_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/diamond_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/diamond_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_rod.json b/src/generated/resources/data/basemetals/recipe/diamond_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_rod.json rename to src/generated/resources/data/basemetals/recipe/diamond_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_scythe.json b/src/generated/resources/data/basemetals/recipe/diamond_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_scythe.json rename to src/generated/resources/data/basemetals/recipe/diamond_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shears.json b/src/generated/resources/data/basemetals/recipe/diamond_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_shears.json rename to src/generated/resources/data/basemetals/recipe/diamond_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shield.json b/src/generated/resources/data/basemetals/recipe/diamond_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_shield.json rename to src/generated/resources/data/basemetals/recipe/diamond_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_slab.json b/src/generated/resources/data/basemetals/recipe/diamond_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_slab.json rename to src/generated/resources/data/basemetals/recipe/diamond_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/diamond_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json b/src/generated/resources/data/basemetals/recipe/diamond_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/diamond_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/diamond_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_stairs.json b/src/generated/resources/data/basemetals/recipe/diamond_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_stairs.json rename to src/generated/resources/data/basemetals/recipe/diamond_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json b/src/generated/resources/data/basemetals/recipe/diamond_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/diamond_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_wall.json b/src/generated/resources/data/basemetals/recipe/diamond_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_wall.json rename to src/generated/resources/data/basemetals/recipe/diamond_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/diamond_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/diamond_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/diamond_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_arrow.json b/src/generated/resources/data/basemetals/recipe/electrum_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_arrow.json rename to src/generated/resources/data/basemetals/recipe/electrum_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_axe.json b/src/generated/resources/data/basemetals/recipe/electrum_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_axe.json rename to src/generated/resources/data/basemetals/recipe/electrum_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars.json b/src/generated/resources/data/basemetals/recipe/electrum_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bars.json rename to src/generated/resources/data/basemetals/recipe/electrum_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json b/src/generated/resources/data/basemetals/recipe/electrum_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bars_2.json rename to src/generated/resources/data/basemetals/recipe/electrum_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend.json b/src/generated/resources/data/basemetals/recipe/electrum_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_blend.json rename to src/generated/resources/data/basemetals/recipe/electrum_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/electrum_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/electrum_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/electrum_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block.json b/src/generated/resources/data/basemetals/recipe/electrum_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_block.json rename to src/generated/resources/data/basemetals/recipe/electrum_block.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json b/src/generated/resources/data/basemetals/recipe/electrum_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/electrum_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bolt.json b/src/generated/resources/data/basemetals/recipe/electrum_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bolt.json rename to src/generated/resources/data/basemetals/recipe/electrum_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_boots.json b/src/generated/resources/data/basemetals/recipe/electrum_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_boots.json rename to src/generated/resources/data/basemetals/recipe/electrum_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/electrum_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bow.json b/src/generated/resources/data/basemetals/recipe/electrum_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bow.json rename to src/generated/resources/data/basemetals/recipe/electrum_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_button.json b/src/generated/resources/data/basemetals/recipe/electrum_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_button.json rename to src/generated/resources/data/basemetals/recipe/electrum_button.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_button_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json b/src/generated/resources/data/basemetals/recipe/electrum_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_chestplate.json rename to src/generated/resources/data/basemetals/recipe/electrum_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/electrum_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json b/src/generated/resources/data/basemetals/recipe/electrum_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/electrum_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json b/src/generated/resources/data/basemetals/recipe/electrum_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_crossbow.json rename to src/generated/resources/data/basemetals/recipe/electrum_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_door.json b/src/generated/resources/data/basemetals/recipe/electrum_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_door.json rename to src/generated/resources/data/basemetals/recipe/electrum_door.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_door_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json b/src/generated/resources/data/basemetals/recipe/electrum_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/electrum_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_gear.json b/src/generated/resources/data/basemetals/recipe/electrum_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_gear.json rename to src/generated/resources/data/basemetals/recipe/electrum_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_helmet.json b/src/generated/resources/data/basemetals/recipe/electrum_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_helmet.json rename to src/generated/resources/data/basemetals/recipe/electrum_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/electrum_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_hoe.json b/src/generated/resources/data/basemetals/recipe/electrum_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_hoe.json rename to src/generated/resources/data/basemetals/recipe/electrum_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json b/src/generated/resources/data/basemetals/recipe/electrum_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/electrum_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/electrum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/electrum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_leggings.json b/src/generated/resources/data/basemetals/recipe/electrum_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_leggings.json rename to src/generated/resources/data/basemetals/recipe/electrum_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/electrum_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_lever.json b/src/generated/resources/data/basemetals/recipe/electrum_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_lever.json rename to src/generated/resources/data/basemetals/recipe/electrum_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json b/src/generated/resources/data/basemetals/recipe/electrum_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_nuggets.json rename to src/generated/resources/data/basemetals/recipe/electrum_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json b/src/generated/resources/data/basemetals/recipe/electrum_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/electrum_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_plate.json b/src/generated/resources/data/basemetals/recipe/electrum_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_plate.json rename to src/generated/resources/data/basemetals/recipe/electrum_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/electrum_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/electrum_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/electrum_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/electrum_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_rod.json b/src/generated/resources/data/basemetals/recipe/electrum_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_rod.json rename to src/generated/resources/data/basemetals/recipe/electrum_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_scythe.json b/src/generated/resources/data/basemetals/recipe/electrum_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_scythe.json rename to src/generated/resources/data/basemetals/recipe/electrum_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shears.json b/src/generated/resources/data/basemetals/recipe/electrum_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_shears.json rename to src/generated/resources/data/basemetals/recipe/electrum_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shield.json b/src/generated/resources/data/basemetals/recipe/electrum_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_shield.json rename to src/generated/resources/data/basemetals/recipe/electrum_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/electrum_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shovel.json b/src/generated/resources/data/basemetals/recipe/electrum_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_shovel.json rename to src/generated/resources/data/basemetals/recipe/electrum_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_slab.json b/src/generated/resources/data/basemetals/recipe/electrum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_slab.json rename to src/generated/resources/data/basemetals/recipe/electrum_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json b/src/generated/resources/data/basemetals/recipe/electrum_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_smallblend.json rename to src/generated/resources/data/basemetals/recipe/electrum_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/electrum_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json b/src/generated/resources/data/basemetals/recipe/electrum_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/electrum_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/electrum_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_stairs.json b/src/generated/resources/data/basemetals/recipe/electrum_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_stairs.json rename to src/generated/resources/data/basemetals/recipe/electrum_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_sword.json b/src/generated/resources/data/basemetals/recipe/electrum_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_sword.json rename to src/generated/resources/data/basemetals/recipe/electrum_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json b/src/generated/resources/data/basemetals/recipe/electrum_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/electrum_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_wall.json b/src/generated/resources/data/basemetals/recipe/electrum_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_wall.json rename to src/generated/resources/data/basemetals/recipe/electrum_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/electrum_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/electrum_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/electrum_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_arrow.json b/src/generated/resources/data/basemetals/recipe/emerald_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_arrow.json rename to src/generated/resources/data/basemetals/recipe/emerald_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_axe.json b/src/generated/resources/data/basemetals/recipe/emerald_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_axe.json rename to src/generated/resources/data/basemetals/recipe/emerald_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars.json b/src/generated/resources/data/basemetals/recipe/emerald_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bars.json rename to src/generated/resources/data/basemetals/recipe/emerald_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json b/src/generated/resources/data/basemetals/recipe/emerald_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bars_2.json rename to src/generated/resources/data/basemetals/recipe/emerald_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_block_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bolt.json b/src/generated/resources/data/basemetals/recipe/emerald_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bolt.json rename to src/generated/resources/data/basemetals/recipe/emerald_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_boots.json b/src/generated/resources/data/basemetals/recipe/emerald_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_boots.json rename to src/generated/resources/data/basemetals/recipe/emerald_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bow.json b/src/generated/resources/data/basemetals/recipe/emerald_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bow.json rename to src/generated/resources/data/basemetals/recipe/emerald_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_button.json b/src/generated/resources/data/basemetals/recipe/emerald_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_button.json rename to src/generated/resources/data/basemetals/recipe/emerald_button.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_button_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_chestplate.json rename to src/generated/resources/data/basemetals/recipe/emerald_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json b/src/generated/resources/data/basemetals/recipe/emerald_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/emerald_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json b/src/generated/resources/data/basemetals/recipe/emerald_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_crossbow.json rename to src/generated/resources/data/basemetals/recipe/emerald_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_crushing.json rename to src/generated/resources/data/basemetals/recipe/emerald_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_door.json b/src/generated/resources/data/basemetals/recipe/emerald_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_door.json rename to src/generated/resources/data/basemetals/recipe/emerald_door.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_door_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json b/src/generated/resources/data/basemetals/recipe/emerald_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/emerald_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_gear.json b/src/generated/resources/data/basemetals/recipe/emerald_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_gear.json rename to src/generated/resources/data/basemetals/recipe/emerald_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_helmet.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_helmet.json rename to src/generated/resources/data/basemetals/recipe/emerald_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_hoe.json b/src/generated/resources/data/basemetals/recipe/emerald_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_hoe.json rename to src/generated/resources/data/basemetals/recipe/emerald_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json b/src/generated/resources/data/basemetals/recipe/emerald_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/emerald_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_leggings.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_leggings.json rename to src/generated/resources/data/basemetals/recipe/emerald_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_lever.json b/src/generated/resources/data/basemetals/recipe/emerald_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_lever.json rename to src/generated/resources/data/basemetals/recipe/emerald_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json b/src/generated/resources/data/basemetals/recipe/emerald_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/emerald_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/emerald_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/emerald_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/emerald_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/emerald_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/emerald_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_rod.json b/src/generated/resources/data/basemetals/recipe/emerald_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_rod.json rename to src/generated/resources/data/basemetals/recipe/emerald_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_scythe.json b/src/generated/resources/data/basemetals/recipe/emerald_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_scythe.json rename to src/generated/resources/data/basemetals/recipe/emerald_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shears.json b/src/generated/resources/data/basemetals/recipe/emerald_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_shears.json rename to src/generated/resources/data/basemetals/recipe/emerald_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shield.json b/src/generated/resources/data/basemetals/recipe/emerald_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_shield.json rename to src/generated/resources/data/basemetals/recipe/emerald_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shovel.json b/src/generated/resources/data/basemetals/recipe/emerald_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_shovel.json rename to src/generated/resources/data/basemetals/recipe/emerald_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_slab.json b/src/generated/resources/data/basemetals/recipe/emerald_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_slab.json rename to src/generated/resources/data/basemetals/recipe/emerald_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json b/src/generated/resources/data/basemetals/recipe/emerald_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/emerald_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/emerald_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/emerald_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_stairs.json b/src/generated/resources/data/basemetals/recipe/emerald_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_stairs.json rename to src/generated/resources/data/basemetals/recipe/emerald_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_sword.json b/src/generated/resources/data/basemetals/recipe/emerald_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_sword.json rename to src/generated/resources/data/basemetals/recipe/emerald_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json b/src/generated/resources/data/basemetals/recipe/emerald_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/emerald_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_wall.json b/src/generated/resources/data/basemetals/recipe/emerald_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_wall.json rename to src/generated/resources/data/basemetals/recipe/emerald_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/emerald_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/emerald_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/emerald_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/flint_and_steel.json b/src/generated/resources/data/basemetals/recipe/flint_and_steel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/flint_and_steel.json rename to src/generated/resources/data/basemetals/recipe/flint_and_steel.json diff --git a/src/generated/resources/data/basemetals/recipes/glass_crushing.json b/src/generated/resources/data/basemetals/recipe/glass_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/glass_crushing.json rename to src/generated/resources/data/basemetals/recipe/glass_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/glowstone_crushing.json b/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/glowstone_crushing.json rename to src/generated/resources/data/basemetals/recipe/glowstone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_arrow.json b/src/generated/resources/data/basemetals/recipe/gold_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_arrow.json rename to src/generated/resources/data/basemetals/recipe/gold_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars.json b/src/generated/resources/data/basemetals/recipe/gold_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bars.json rename to src/generated/resources/data/basemetals/recipe/gold_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars_2.json b/src/generated/resources/data/basemetals/recipe/gold_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bars_2.json rename to src/generated/resources/data/basemetals/recipe/gold_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_block_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/gold_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bolt.json b/src/generated/resources/data/basemetals/recipe/gold_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bolt.json rename to src/generated/resources/data/basemetals/recipe/gold_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/gold_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bow.json b/src/generated/resources/data/basemetals/recipe/gold_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bow.json rename to src/generated/resources/data/basemetals/recipe/gold_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_button.json b/src/generated/resources/data/basemetals/recipe/gold_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_button.json rename to src/generated/resources/data/basemetals/recipe/gold_button.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_button_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/gold_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json b/src/generated/resources/data/basemetals/recipe/gold_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/gold_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_crossbow.json b/src/generated/resources/data/basemetals/recipe/gold_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_crossbow.json rename to src/generated/resources/data/basemetals/recipe/gold_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_door.json b/src/generated/resources/data/basemetals/recipe/gold_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_door.json rename to src/generated/resources/data/basemetals/recipe/gold_door.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_door_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json b/src/generated/resources/data/basemetals/recipe/gold_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/gold_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_gear.json b/src/generated/resources/data/basemetals/recipe/gold_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_gear.json rename to src/generated/resources/data/basemetals/recipe/gold_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/gold_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/gold_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_lever.json b/src/generated/resources/data/basemetals/recipe/gold_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_lever.json rename to src/generated/resources/data/basemetals/recipe/gold_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_plate.json b/src/generated/resources/data/basemetals/recipe/gold_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_plate.json rename to src/generated/resources/data/basemetals/recipe/gold_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/gold_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/gold_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/gold_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_rod.json b/src/generated/resources/data/basemetals/recipe/gold_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_rod.json rename to src/generated/resources/data/basemetals/recipe/gold_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_scythe.json b/src/generated/resources/data/basemetals/recipe/gold_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_scythe.json rename to src/generated/resources/data/basemetals/recipe/gold_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_shears.json b/src/generated/resources/data/basemetals/recipe/gold_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_shears.json rename to src/generated/resources/data/basemetals/recipe/gold_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_shield.json b/src/generated/resources/data/basemetals/recipe/gold_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_shield.json rename to src/generated/resources/data/basemetals/recipe/gold_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/gold_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_slab.json b/src/generated/resources/data/basemetals/recipe/gold_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_slab.json rename to src/generated/resources/data/basemetals/recipe/gold_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/gold_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json b/src/generated/resources/data/basemetals/recipe/gold_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/gold_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/gold_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_stairs.json b/src/generated/resources/data/basemetals/recipe/gold_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_stairs.json rename to src/generated/resources/data/basemetals/recipe/gold_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json b/src/generated/resources/data/basemetals/recipe/gold_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/gold_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_wall.json b/src/generated/resources/data/basemetals/recipe/gold_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_wall.json rename to src/generated/resources/data/basemetals/recipe/gold_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/gold_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gold_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/gold_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/gravel_crushing.json b/src/generated/resources/data/basemetals/recipe/gravel_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/gravel_crushing.json rename to src/generated/resources/data/basemetals/recipe/gravel_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/human_detector.json b/src/generated/resources/data/basemetals/recipe/human_detector.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/human_detector.json rename to src/generated/resources/data/basemetals/recipe/human_detector.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_arrow.json b/src/generated/resources/data/basemetals/recipe/invar_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_arrow.json rename to src/generated/resources/data/basemetals/recipe/invar_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_axe.json b/src/generated/resources/data/basemetals/recipe/invar_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_axe.json rename to src/generated/resources/data/basemetals/recipe/invar_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars.json b/src/generated/resources/data/basemetals/recipe/invar_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bars.json rename to src/generated/resources/data/basemetals/recipe/invar_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars_2.json b/src/generated/resources/data/basemetals/recipe/invar_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bars_2.json rename to src/generated/resources/data/basemetals/recipe/invar_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend.json b/src/generated/resources/data/basemetals/recipe/invar_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_blend.json rename to src/generated/resources/data/basemetals/recipe/invar_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/invar_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/invar_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/invar_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_block.json b/src/generated/resources/data/basemetals/recipe/invar_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_block.json rename to src/generated/resources/data/basemetals/recipe/invar_block.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_block_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/invar_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json b/src/generated/resources/data/basemetals/recipe/invar_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/invar_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bolt.json b/src/generated/resources/data/basemetals/recipe/invar_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bolt.json rename to src/generated/resources/data/basemetals/recipe/invar_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_boots.json b/src/generated/resources/data/basemetals/recipe/invar_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_boots.json rename to src/generated/resources/data/basemetals/recipe/invar_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bow.json b/src/generated/resources/data/basemetals/recipe/invar_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bow.json rename to src/generated/resources/data/basemetals/recipe/invar_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_button.json b/src/generated/resources/data/basemetals/recipe/invar_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_button.json rename to src/generated/resources/data/basemetals/recipe/invar_button.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_button_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_chestplate.json b/src/generated/resources/data/basemetals/recipe/invar_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_chestplate.json rename to src/generated/resources/data/basemetals/recipe/invar_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json b/src/generated/resources/data/basemetals/recipe/invar_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/invar_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_crossbow.json b/src/generated/resources/data/basemetals/recipe/invar_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_crossbow.json rename to src/generated/resources/data/basemetals/recipe/invar_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_door.json b/src/generated/resources/data/basemetals/recipe/invar_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_door.json rename to src/generated/resources/data/basemetals/recipe/invar_door.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_door_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json b/src/generated/resources/data/basemetals/recipe/invar_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/invar_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_gear.json b/src/generated/resources/data/basemetals/recipe/invar_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_gear.json rename to src/generated/resources/data/basemetals/recipe/invar_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_helmet.json b/src/generated/resources/data/basemetals/recipe/invar_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_helmet.json rename to src/generated/resources/data/basemetals/recipe/invar_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_hoe.json b/src/generated/resources/data/basemetals/recipe/invar_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_hoe.json rename to src/generated/resources/data/basemetals/recipe/invar_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json b/src/generated/resources/data/basemetals/recipe/invar_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/invar_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/invar_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/invar_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_leggings.json b/src/generated/resources/data/basemetals/recipe/invar_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_leggings.json rename to src/generated/resources/data/basemetals/recipe/invar_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_lever.json b/src/generated/resources/data/basemetals/recipe/invar_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_lever.json rename to src/generated/resources/data/basemetals/recipe/invar_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_nuggets.json b/src/generated/resources/data/basemetals/recipe/invar_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_nuggets.json rename to src/generated/resources/data/basemetals/recipe/invar_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json b/src/generated/resources/data/basemetals/recipe/invar_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/invar_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_plate.json b/src/generated/resources/data/basemetals/recipe/invar_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_plate.json rename to src/generated/resources/data/basemetals/recipe/invar_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/invar_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/invar_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/invar_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/invar_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/invar_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_rod.json b/src/generated/resources/data/basemetals/recipe/invar_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_rod.json rename to src/generated/resources/data/basemetals/recipe/invar_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_scythe.json b/src/generated/resources/data/basemetals/recipe/invar_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_scythe.json rename to src/generated/resources/data/basemetals/recipe/invar_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_shears.json b/src/generated/resources/data/basemetals/recipe/invar_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_shears.json rename to src/generated/resources/data/basemetals/recipe/invar_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_shield.json b/src/generated/resources/data/basemetals/recipe/invar_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_shield.json rename to src/generated/resources/data/basemetals/recipe/invar_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_shovel.json b/src/generated/resources/data/basemetals/recipe/invar_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_shovel.json rename to src/generated/resources/data/basemetals/recipe/invar_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_slab.json b/src/generated/resources/data/basemetals/recipe/invar_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_slab.json rename to src/generated/resources/data/basemetals/recipe/invar_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallblend.json b/src/generated/resources/data/basemetals/recipe/invar_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_smallblend.json rename to src/generated/resources/data/basemetals/recipe/invar_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/invar_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json b/src/generated/resources/data/basemetals/recipe/invar_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/invar_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/invar_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_stairs.json b/src/generated/resources/data/basemetals/recipe/invar_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_stairs.json rename to src/generated/resources/data/basemetals/recipe/invar_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_sword.json b/src/generated/resources/data/basemetals/recipe/invar_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_sword.json rename to src/generated/resources/data/basemetals/recipe/invar_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json b/src/generated/resources/data/basemetals/recipe/invar_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/invar_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_wall.json b/src/generated/resources/data/basemetals/recipe/invar_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_wall.json rename to src/generated/resources/data/basemetals/recipe/invar_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/invar_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/invar_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/invar_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_arrow.json b/src/generated/resources/data/basemetals/recipe/iron_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_arrow.json rename to src/generated/resources/data/basemetals/recipe/iron_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_bars_2.json b/src/generated/resources/data/basemetals/recipe/iron_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_bars_2.json rename to src/generated/resources/data/basemetals/recipe/iron_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_block_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/iron_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_bolt.json b/src/generated/resources/data/basemetals/recipe/iron_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_bolt.json rename to src/generated/resources/data/basemetals/recipe/iron_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/iron_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_bow.json b/src/generated/resources/data/basemetals/recipe/iron_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_bow.json rename to src/generated/resources/data/basemetals/recipe/iron_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_button.json b/src/generated/resources/data/basemetals/recipe/iron_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_button.json rename to src/generated/resources/data/basemetals/recipe/iron_button.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_button_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/iron_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json b/src/generated/resources/data/basemetals/recipe/iron_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/iron_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_crossbow.json b/src/generated/resources/data/basemetals/recipe/iron_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_crossbow.json rename to src/generated/resources/data/basemetals/recipe/iron_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json b/src/generated/resources/data/basemetals/recipe/iron_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/iron_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_gear.json b/src/generated/resources/data/basemetals/recipe/iron_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_gear.json rename to src/generated/resources/data/basemetals/recipe/iron_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/iron_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/iron_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_lever.json b/src/generated/resources/data/basemetals/recipe/iron_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_lever.json rename to src/generated/resources/data/basemetals/recipe/iron_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_plate.json b/src/generated/resources/data/basemetals/recipe/iron_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_plate.json rename to src/generated/resources/data/basemetals/recipe/iron_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/iron_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/iron_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/iron_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_rod.json b/src/generated/resources/data/basemetals/recipe/iron_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_rod.json rename to src/generated/resources/data/basemetals/recipe/iron_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_scythe.json b/src/generated/resources/data/basemetals/recipe/iron_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_scythe.json rename to src/generated/resources/data/basemetals/recipe/iron_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_shield.json b/src/generated/resources/data/basemetals/recipe/iron_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_shield.json rename to src/generated/resources/data/basemetals/recipe/iron_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/iron_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_slab.json b/src/generated/resources/data/basemetals/recipe/iron_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_slab.json rename to src/generated/resources/data/basemetals/recipe/iron_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/iron_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json b/src/generated/resources/data/basemetals/recipe/iron_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/iron_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/iron_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_stairs.json b/src/generated/resources/data/basemetals/recipe/iron_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_stairs.json rename to src/generated/resources/data/basemetals/recipe/iron_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_wall.json b/src/generated/resources/data/basemetals/recipe/iron_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_wall.json rename to src/generated/resources/data/basemetals/recipe/iron_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/iron_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/iron_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/iron_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lapis_block_crushing.json b/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lapis_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lapis_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lapis_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_arrow.json b/src/generated/resources/data/basemetals/recipe/lead_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_arrow.json rename to src/generated/resources/data/basemetals/recipe/lead_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_axe.json b/src/generated/resources/data/basemetals/recipe/lead_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_axe.json rename to src/generated/resources/data/basemetals/recipe/lead_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars.json b/src/generated/resources/data/basemetals/recipe/lead_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bars.json rename to src/generated/resources/data/basemetals/recipe/lead_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars_2.json b/src/generated/resources/data/basemetals/recipe/lead_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bars_2.json rename to src/generated/resources/data/basemetals/recipe/lead_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_block.json b/src/generated/resources/data/basemetals/recipe/lead_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_block.json rename to src/generated/resources/data/basemetals/recipe/lead_block.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_block_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/lead_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json b/src/generated/resources/data/basemetals/recipe/lead_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/lead_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bolt.json b/src/generated/resources/data/basemetals/recipe/lead_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bolt.json rename to src/generated/resources/data/basemetals/recipe/lead_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_boots.json b/src/generated/resources/data/basemetals/recipe/lead_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_boots.json rename to src/generated/resources/data/basemetals/recipe/lead_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/lead_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bow.json b/src/generated/resources/data/basemetals/recipe/lead_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bow.json rename to src/generated/resources/data/basemetals/recipe/lead_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_button.json b/src/generated/resources/data/basemetals/recipe/lead_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_button.json rename to src/generated/resources/data/basemetals/recipe/lead_button.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_button_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_chestplate.json b/src/generated/resources/data/basemetals/recipe/lead_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_chestplate.json rename to src/generated/resources/data/basemetals/recipe/lead_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/lead_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json b/src/generated/resources/data/basemetals/recipe/lead_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/lead_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_crossbow.json b/src/generated/resources/data/basemetals/recipe/lead_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_crossbow.json rename to src/generated/resources/data/basemetals/recipe/lead_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_door.json b/src/generated/resources/data/basemetals/recipe/lead_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_door.json rename to src/generated/resources/data/basemetals/recipe/lead_door.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_door_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json b/src/generated/resources/data/basemetals/recipe/lead_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/lead_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_gear.json b/src/generated/resources/data/basemetals/recipe/lead_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_gear.json rename to src/generated/resources/data/basemetals/recipe/lead_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_helmet.json b/src/generated/resources/data/basemetals/recipe/lead_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_helmet.json rename to src/generated/resources/data/basemetals/recipe/lead_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/lead_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_hoe.json b/src/generated/resources/data/basemetals/recipe/lead_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_hoe.json rename to src/generated/resources/data/basemetals/recipe/lead_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json b/src/generated/resources/data/basemetals/recipe/lead_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/lead_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/lead_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/lead_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_leggings.json b/src/generated/resources/data/basemetals/recipe/lead_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_leggings.json rename to src/generated/resources/data/basemetals/recipe/lead_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/lead_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_lever.json b/src/generated/resources/data/basemetals/recipe/lead_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_lever.json rename to src/generated/resources/data/basemetals/recipe/lead_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_nuggets.json b/src/generated/resources/data/basemetals/recipe/lead_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_nuggets.json rename to src/generated/resources/data/basemetals/recipe/lead_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/lead_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/lead_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/lead_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json b/src/generated/resources/data/basemetals/recipe/lead_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/lead_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_plate.json b/src/generated/resources/data/basemetals/recipe/lead_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_plate.json rename to src/generated/resources/data/basemetals/recipe/lead_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/lead_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/lead_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/lead_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/lead_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/lead_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/lead_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/lead_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/lead_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_rod.json b/src/generated/resources/data/basemetals/recipe/lead_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_rod.json rename to src/generated/resources/data/basemetals/recipe/lead_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_scythe.json b/src/generated/resources/data/basemetals/recipe/lead_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_scythe.json rename to src/generated/resources/data/basemetals/recipe/lead_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_shears.json b/src/generated/resources/data/basemetals/recipe/lead_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_shears.json rename to src/generated/resources/data/basemetals/recipe/lead_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_shield.json b/src/generated/resources/data/basemetals/recipe/lead_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_shield.json rename to src/generated/resources/data/basemetals/recipe/lead_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/lead_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_shovel.json b/src/generated/resources/data/basemetals/recipe/lead_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_shovel.json rename to src/generated/resources/data/basemetals/recipe/lead_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_slab.json b/src/generated/resources/data/basemetals/recipe/lead_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_slab.json rename to src/generated/resources/data/basemetals/recipe/lead_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json b/src/generated/resources/data/basemetals/recipe/lead_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/lead_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/lead_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_stairs.json b/src/generated/resources/data/basemetals/recipe/lead_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_stairs.json rename to src/generated/resources/data/basemetals/recipe/lead_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_sword.json b/src/generated/resources/data/basemetals/recipe/lead_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_sword.json rename to src/generated/resources/data/basemetals/recipe/lead_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json b/src/generated/resources/data/basemetals/recipe/lead_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/lead_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_wall.json b/src/generated/resources/data/basemetals/recipe/lead_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_wall.json rename to src/generated/resources/data/basemetals/recipe/lead_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/lead_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/lead_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/lead_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/mercury_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/mercury_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json b/src/generated/resources/data/basemetals/recipe/mercury_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_nuggets.json rename to src/generated/resources/data/basemetals/recipe/mercury_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/mercury_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/mercury_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/mercury_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/mercury_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/mercury_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/mercury_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/mercury_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json b/src/generated/resources/data/basemetals/recipe/mercury_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/mercury_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/mercury_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/minecart.json b/src/generated/resources/data/basemetals/recipe/minecart.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/minecart.json rename to src/generated/resources/data/basemetals/recipe/minecart.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_arrow.json b/src/generated/resources/data/basemetals/recipe/mithril_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_arrow.json rename to src/generated/resources/data/basemetals/recipe/mithril_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_axe.json b/src/generated/resources/data/basemetals/recipe/mithril_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_axe.json rename to src/generated/resources/data/basemetals/recipe/mithril_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars.json b/src/generated/resources/data/basemetals/recipe/mithril_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bars.json rename to src/generated/resources/data/basemetals/recipe/mithril_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json b/src/generated/resources/data/basemetals/recipe/mithril_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bars_2.json rename to src/generated/resources/data/basemetals/recipe/mithril_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend.json b/src/generated/resources/data/basemetals/recipe/mithril_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_blend.json rename to src/generated/resources/data/basemetals/recipe/mithril_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/mithril_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/mithril_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/mithril_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block.json b/src/generated/resources/data/basemetals/recipe/mithril_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_block.json rename to src/generated/resources/data/basemetals/recipe/mithril_block.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json b/src/generated/resources/data/basemetals/recipe/mithril_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/mithril_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bolt.json b/src/generated/resources/data/basemetals/recipe/mithril_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bolt.json rename to src/generated/resources/data/basemetals/recipe/mithril_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_boots.json b/src/generated/resources/data/basemetals/recipe/mithril_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_boots.json rename to src/generated/resources/data/basemetals/recipe/mithril_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bow.json b/src/generated/resources/data/basemetals/recipe/mithril_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bow.json rename to src/generated/resources/data/basemetals/recipe/mithril_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_button.json b/src/generated/resources/data/basemetals/recipe/mithril_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_button.json rename to src/generated/resources/data/basemetals/recipe/mithril_button.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_button_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json b/src/generated/resources/data/basemetals/recipe/mithril_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_chestplate.json rename to src/generated/resources/data/basemetals/recipe/mithril_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json b/src/generated/resources/data/basemetals/recipe/mithril_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/mithril_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json b/src/generated/resources/data/basemetals/recipe/mithril_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_crossbow.json rename to src/generated/resources/data/basemetals/recipe/mithril_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_door.json b/src/generated/resources/data/basemetals/recipe/mithril_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_door.json rename to src/generated/resources/data/basemetals/recipe/mithril_door.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_door_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json b/src/generated/resources/data/basemetals/recipe/mithril_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/mithril_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_gear.json b/src/generated/resources/data/basemetals/recipe/mithril_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_gear.json rename to src/generated/resources/data/basemetals/recipe/mithril_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_helmet.json b/src/generated/resources/data/basemetals/recipe/mithril_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_helmet.json rename to src/generated/resources/data/basemetals/recipe/mithril_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_hoe.json b/src/generated/resources/data/basemetals/recipe/mithril_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_hoe.json rename to src/generated/resources/data/basemetals/recipe/mithril_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json b/src/generated/resources/data/basemetals/recipe/mithril_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/mithril_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/mithril_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/mithril_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_leggings.json b/src/generated/resources/data/basemetals/recipe/mithril_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_leggings.json rename to src/generated/resources/data/basemetals/recipe/mithril_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_lever.json b/src/generated/resources/data/basemetals/recipe/mithril_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_lever.json rename to src/generated/resources/data/basemetals/recipe/mithril_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json b/src/generated/resources/data/basemetals/recipe/mithril_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_nuggets.json rename to src/generated/resources/data/basemetals/recipe/mithril_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json b/src/generated/resources/data/basemetals/recipe/mithril_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/mithril_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_plate.json b/src/generated/resources/data/basemetals/recipe/mithril_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_plate.json rename to src/generated/resources/data/basemetals/recipe/mithril_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/mithril_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/mithril_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/mithril_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/mithril_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_rod.json b/src/generated/resources/data/basemetals/recipe/mithril_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_rod.json rename to src/generated/resources/data/basemetals/recipe/mithril_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_scythe.json b/src/generated/resources/data/basemetals/recipe/mithril_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_scythe.json rename to src/generated/resources/data/basemetals/recipe/mithril_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shears.json b/src/generated/resources/data/basemetals/recipe/mithril_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_shears.json rename to src/generated/resources/data/basemetals/recipe/mithril_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shield.json b/src/generated/resources/data/basemetals/recipe/mithril_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_shield.json rename to src/generated/resources/data/basemetals/recipe/mithril_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shovel.json b/src/generated/resources/data/basemetals/recipe/mithril_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_shovel.json rename to src/generated/resources/data/basemetals/recipe/mithril_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_slab.json b/src/generated/resources/data/basemetals/recipe/mithril_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_slab.json rename to src/generated/resources/data/basemetals/recipe/mithril_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json b/src/generated/resources/data/basemetals/recipe/mithril_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_smallblend.json rename to src/generated/resources/data/basemetals/recipe/mithril_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/mithril_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json b/src/generated/resources/data/basemetals/recipe/mithril_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/mithril_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/mithril_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_stairs.json b/src/generated/resources/data/basemetals/recipe/mithril_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_stairs.json rename to src/generated/resources/data/basemetals/recipe/mithril_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_sword.json b/src/generated/resources/data/basemetals/recipe/mithril_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_sword.json rename to src/generated/resources/data/basemetals/recipe/mithril_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json b/src/generated/resources/data/basemetals/recipe/mithril_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/mithril_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_wall.json b/src/generated/resources/data/basemetals/recipe/mithril_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_wall.json rename to src/generated/resources/data/basemetals/recipe/mithril_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/mithril_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mithril_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/mithril_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mossy_cobblestone_crushing.json rename to src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/mossy_cobblestone_wall_crushing.json rename to src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_arrow.json b/src/generated/resources/data/basemetals/recipe/nickel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_arrow.json rename to src/generated/resources/data/basemetals/recipe/nickel_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_axe.json b/src/generated/resources/data/basemetals/recipe/nickel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_axe.json rename to src/generated/resources/data/basemetals/recipe/nickel_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars.json b/src/generated/resources/data/basemetals/recipe/nickel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bars.json rename to src/generated/resources/data/basemetals/recipe/nickel_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json b/src/generated/resources/data/basemetals/recipe/nickel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bars_2.json rename to src/generated/resources/data/basemetals/recipe/nickel_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block.json b/src/generated/resources/data/basemetals/recipe/nickel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_block.json rename to src/generated/resources/data/basemetals/recipe/nickel_block.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/nickel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/nickel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bolt.json b/src/generated/resources/data/basemetals/recipe/nickel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bolt.json rename to src/generated/resources/data/basemetals/recipe/nickel_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_boots.json b/src/generated/resources/data/basemetals/recipe/nickel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_boots.json rename to src/generated/resources/data/basemetals/recipe/nickel_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/nickel_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bow.json b/src/generated/resources/data/basemetals/recipe/nickel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bow.json rename to src/generated/resources/data/basemetals/recipe/nickel_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_button.json b/src/generated/resources/data/basemetals/recipe/nickel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_button.json rename to src/generated/resources/data/basemetals/recipe/nickel_button.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json b/src/generated/resources/data/basemetals/recipe/nickel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_chestplate.json rename to src/generated/resources/data/basemetals/recipe/nickel_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/nickel_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/nickel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/nickel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json b/src/generated/resources/data/basemetals/recipe/nickel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_crossbow.json rename to src/generated/resources/data/basemetals/recipe/nickel_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_door.json b/src/generated/resources/data/basemetals/recipe/nickel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_door.json rename to src/generated/resources/data/basemetals/recipe/nickel_door.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/nickel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/nickel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_gear.json b/src/generated/resources/data/basemetals/recipe/nickel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_gear.json rename to src/generated/resources/data/basemetals/recipe/nickel_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_helmet.json b/src/generated/resources/data/basemetals/recipe/nickel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_helmet.json rename to src/generated/resources/data/basemetals/recipe/nickel_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/nickel_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_hoe.json b/src/generated/resources/data/basemetals/recipe/nickel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_hoe.json rename to src/generated/resources/data/basemetals/recipe/nickel_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/nickel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/nickel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/nickel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/nickel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_leggings.json b/src/generated/resources/data/basemetals/recipe/nickel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_leggings.json rename to src/generated/resources/data/basemetals/recipe/nickel_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/nickel_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_lever.json b/src/generated/resources/data/basemetals/recipe/nickel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_lever.json rename to src/generated/resources/data/basemetals/recipe/nickel_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json b/src/generated/resources/data/basemetals/recipe/nickel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_nuggets.json rename to src/generated/resources/data/basemetals/recipe/nickel_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/nickel_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/nickel_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/nickel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/nickel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_plate.json b/src/generated/resources/data/basemetals/recipe/nickel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_plate.json rename to src/generated/resources/data/basemetals/recipe/nickel_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/nickel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/nickel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/nickel_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/nickel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/nickel_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/nickel_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_rod.json b/src/generated/resources/data/basemetals/recipe/nickel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_rod.json rename to src/generated/resources/data/basemetals/recipe/nickel_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_scythe.json b/src/generated/resources/data/basemetals/recipe/nickel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_scythe.json rename to src/generated/resources/data/basemetals/recipe/nickel_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shears.json b/src/generated/resources/data/basemetals/recipe/nickel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_shears.json rename to src/generated/resources/data/basemetals/recipe/nickel_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shield.json b/src/generated/resources/data/basemetals/recipe/nickel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_shield.json rename to src/generated/resources/data/basemetals/recipe/nickel_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/nickel_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shovel.json b/src/generated/resources/data/basemetals/recipe/nickel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_shovel.json rename to src/generated/resources/data/basemetals/recipe/nickel_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_slab.json b/src/generated/resources/data/basemetals/recipe/nickel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_slab.json rename to src/generated/resources/data/basemetals/recipe/nickel_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/nickel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/nickel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/nickel_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_stairs.json b/src/generated/resources/data/basemetals/recipe/nickel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_stairs.json rename to src/generated/resources/data/basemetals/recipe/nickel_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_sword.json b/src/generated/resources/data/basemetals/recipe/nickel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_sword.json rename to src/generated/resources/data/basemetals/recipe/nickel_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/nickel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/nickel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_wall.json b/src/generated/resources/data/basemetals/recipe/nickel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_wall.json rename to src/generated/resources/data/basemetals/recipe/nickel_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/nickel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/nickel_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/nickel_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json b/src/generated/resources/data/basemetals/recipe/obsidian_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_arrow.json rename to src/generated/resources/data/basemetals/recipe/obsidian_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_axe.json b/src/generated/resources/data/basemetals/recipe/obsidian_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_axe.json rename to src/generated/resources/data/basemetals/recipe/obsidian_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars.json b/src/generated/resources/data/basemetals/recipe/obsidian_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bars.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json b/src/generated/resources/data/basemetals/recipe/obsidian_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_block.json b/src/generated/resources/data/basemetals/recipe/obsidian_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_block.json rename to src/generated/resources/data/basemetals/recipe/obsidian_block.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json b/src/generated/resources/data/basemetals/recipe/obsidian_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bolt.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_boots.json b/src/generated/resources/data/basemetals/recipe/obsidian_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_boots.json rename to src/generated/resources/data/basemetals/recipe/obsidian_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bow.json b/src/generated/resources/data/basemetals/recipe/obsidian_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bow.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_button.json b/src/generated/resources/data/basemetals/recipe/obsidian_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_button.json rename to src/generated/resources/data/basemetals/recipe/obsidian_button.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_button_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json b/src/generated/resources/data/basemetals/recipe/obsidian_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json rename to src/generated/resources/data/basemetals/recipe/obsidian_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/obsidian_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json b/src/generated/resources/data/basemetals/recipe/obsidian_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json rename to src/generated/resources/data/basemetals/recipe/obsidian_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_crushing.json rename to src/generated/resources/data/basemetals/recipe/obsidian_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_door.json b/src/generated/resources/data/basemetals/recipe/obsidian_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_door.json rename to src/generated/resources/data/basemetals/recipe/obsidian_door.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_door_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/recipe/obsidian_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/obsidian_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_gear.json b/src/generated/resources/data/basemetals/recipe/obsidian_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_gear.json rename to src/generated/resources/data/basemetals/recipe/obsidian_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json b/src/generated/resources/data/basemetals/recipe/obsidian_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_helmet.json rename to src/generated/resources/data/basemetals/recipe/obsidian_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json b/src/generated/resources/data/basemetals/recipe/obsidian_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_hoe.json rename to src/generated/resources/data/basemetals/recipe/obsidian_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/recipe/obsidian_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/obsidian_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json b/src/generated/resources/data/basemetals/recipe/obsidian_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_ingot.json rename to src/generated/resources/data/basemetals/recipe/obsidian_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json b/src/generated/resources/data/basemetals/recipe/obsidian_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_leggings.json rename to src/generated/resources/data/basemetals/recipe/obsidian_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_lever.json b/src/generated/resources/data/basemetals/recipe/obsidian_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_lever.json rename to src/generated/resources/data/basemetals/recipe/obsidian_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json b/src/generated/resources/data/basemetals/recipe/obsidian_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_nugget.json rename to src/generated/resources/data/basemetals/recipe/obsidian_nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/obsidian_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/obsidian_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/obsidian_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/obsidian_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/obsidian_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_rod.json b/src/generated/resources/data/basemetals/recipe/obsidian_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_rod.json rename to src/generated/resources/data/basemetals/recipe/obsidian_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json b/src/generated/resources/data/basemetals/recipe/obsidian_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_scythe.json rename to src/generated/resources/data/basemetals/recipe/obsidian_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shears.json b/src/generated/resources/data/basemetals/recipe/obsidian_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_shears.json rename to src/generated/resources/data/basemetals/recipe/obsidian_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shield.json b/src/generated/resources/data/basemetals/recipe/obsidian_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_shield.json rename to src/generated/resources/data/basemetals/recipe/obsidian_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json b/src/generated/resources/data/basemetals/recipe/obsidian_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_shovel.json rename to src/generated/resources/data/basemetals/recipe/obsidian_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_slab.json b/src/generated/resources/data/basemetals/recipe/obsidian_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_slab.json rename to src/generated/resources/data/basemetals/recipe/obsidian_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/obsidian_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/obsidian_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json b/src/generated/resources/data/basemetals/recipe/obsidian_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_stairs.json rename to src/generated/resources/data/basemetals/recipe/obsidian_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_sword.json b/src/generated/resources/data/basemetals/recipe/obsidian_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_sword.json rename to src/generated/resources/data/basemetals/recipe/obsidian_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/obsidian_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_wall.json b/src/generated/resources/data/basemetals/recipe/obsidian_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_wall.json rename to src/generated/resources/data/basemetals/recipe/obsidian_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/obsidian_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/obsidian_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_arrow.json b/src/generated/resources/data/basemetals/recipe/pewter_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_arrow.json rename to src/generated/resources/data/basemetals/recipe/pewter_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_axe.json b/src/generated/resources/data/basemetals/recipe/pewter_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_axe.json rename to src/generated/resources/data/basemetals/recipe/pewter_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars.json b/src/generated/resources/data/basemetals/recipe/pewter_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bars.json rename to src/generated/resources/data/basemetals/recipe/pewter_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json b/src/generated/resources/data/basemetals/recipe/pewter_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bars_2.json rename to src/generated/resources/data/basemetals/recipe/pewter_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend.json b/src/generated/resources/data/basemetals/recipe/pewter_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_blend.json rename to src/generated/resources/data/basemetals/recipe/pewter_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/pewter_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/pewter_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/pewter_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block.json b/src/generated/resources/data/basemetals/recipe/pewter_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_block.json rename to src/generated/resources/data/basemetals/recipe/pewter_block.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json b/src/generated/resources/data/basemetals/recipe/pewter_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/pewter_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bolt.json b/src/generated/resources/data/basemetals/recipe/pewter_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bolt.json rename to src/generated/resources/data/basemetals/recipe/pewter_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_boots.json b/src/generated/resources/data/basemetals/recipe/pewter_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_boots.json rename to src/generated/resources/data/basemetals/recipe/pewter_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/pewter_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bow.json b/src/generated/resources/data/basemetals/recipe/pewter_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bow.json rename to src/generated/resources/data/basemetals/recipe/pewter_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_button.json b/src/generated/resources/data/basemetals/recipe/pewter_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_button.json rename to src/generated/resources/data/basemetals/recipe/pewter_button.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_button_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json b/src/generated/resources/data/basemetals/recipe/pewter_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_chestplate.json rename to src/generated/resources/data/basemetals/recipe/pewter_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/pewter_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json b/src/generated/resources/data/basemetals/recipe/pewter_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/pewter_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json b/src/generated/resources/data/basemetals/recipe/pewter_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_crossbow.json rename to src/generated/resources/data/basemetals/recipe/pewter_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_door.json b/src/generated/resources/data/basemetals/recipe/pewter_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_door.json rename to src/generated/resources/data/basemetals/recipe/pewter_door.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_door_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json b/src/generated/resources/data/basemetals/recipe/pewter_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/pewter_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_gear.json b/src/generated/resources/data/basemetals/recipe/pewter_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_gear.json rename to src/generated/resources/data/basemetals/recipe/pewter_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_helmet.json b/src/generated/resources/data/basemetals/recipe/pewter_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_helmet.json rename to src/generated/resources/data/basemetals/recipe/pewter_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/pewter_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_hoe.json b/src/generated/resources/data/basemetals/recipe/pewter_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_hoe.json rename to src/generated/resources/data/basemetals/recipe/pewter_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json b/src/generated/resources/data/basemetals/recipe/pewter_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/pewter_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/pewter_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/pewter_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_leggings.json b/src/generated/resources/data/basemetals/recipe/pewter_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_leggings.json rename to src/generated/resources/data/basemetals/recipe/pewter_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/pewter_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_lever.json b/src/generated/resources/data/basemetals/recipe/pewter_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_lever.json rename to src/generated/resources/data/basemetals/recipe/pewter_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json b/src/generated/resources/data/basemetals/recipe/pewter_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_nuggets.json rename to src/generated/resources/data/basemetals/recipe/pewter_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json b/src/generated/resources/data/basemetals/recipe/pewter_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/pewter_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_plate.json b/src/generated/resources/data/basemetals/recipe/pewter_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_plate.json rename to src/generated/resources/data/basemetals/recipe/pewter_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/pewter_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/pewter_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/pewter_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/pewter_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_rod.json b/src/generated/resources/data/basemetals/recipe/pewter_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_rod.json rename to src/generated/resources/data/basemetals/recipe/pewter_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_scythe.json b/src/generated/resources/data/basemetals/recipe/pewter_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_scythe.json rename to src/generated/resources/data/basemetals/recipe/pewter_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shears.json b/src/generated/resources/data/basemetals/recipe/pewter_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_shears.json rename to src/generated/resources/data/basemetals/recipe/pewter_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shield.json b/src/generated/resources/data/basemetals/recipe/pewter_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_shield.json rename to src/generated/resources/data/basemetals/recipe/pewter_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/pewter_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shovel.json b/src/generated/resources/data/basemetals/recipe/pewter_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_shovel.json rename to src/generated/resources/data/basemetals/recipe/pewter_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_slab.json b/src/generated/resources/data/basemetals/recipe/pewter_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_slab.json rename to src/generated/resources/data/basemetals/recipe/pewter_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json b/src/generated/resources/data/basemetals/recipe/pewter_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_smallblend.json rename to src/generated/resources/data/basemetals/recipe/pewter_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/pewter_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json b/src/generated/resources/data/basemetals/recipe/pewter_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/pewter_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/pewter_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_stairs.json b/src/generated/resources/data/basemetals/recipe/pewter_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_stairs.json rename to src/generated/resources/data/basemetals/recipe/pewter_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_sword.json b/src/generated/resources/data/basemetals/recipe/pewter_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_sword.json rename to src/generated/resources/data/basemetals/recipe/pewter_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json b/src/generated/resources/data/basemetals/recipe/pewter_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/pewter_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_wall.json b/src/generated/resources/data/basemetals/recipe/pewter_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_wall.json rename to src/generated/resources/data/basemetals/recipe/pewter_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/pewter_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/pewter_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/pewter_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/piston.json b/src/generated/resources/data/basemetals/recipe/piston.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/piston.json rename to src/generated/resources/data/basemetals/recipe/piston.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_arrow.json b/src/generated/resources/data/basemetals/recipe/platinum_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_arrow.json rename to src/generated/resources/data/basemetals/recipe/platinum_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_axe.json b/src/generated/resources/data/basemetals/recipe/platinum_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_axe.json rename to src/generated/resources/data/basemetals/recipe/platinum_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars.json b/src/generated/resources/data/basemetals/recipe/platinum_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bars.json rename to src/generated/resources/data/basemetals/recipe/platinum_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json b/src/generated/resources/data/basemetals/recipe/platinum_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bars_2.json rename to src/generated/resources/data/basemetals/recipe/platinum_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block.json b/src/generated/resources/data/basemetals/recipe/platinum_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_block.json rename to src/generated/resources/data/basemetals/recipe/platinum_block.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json b/src/generated/resources/data/basemetals/recipe/platinum_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/platinum_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bolt.json b/src/generated/resources/data/basemetals/recipe/platinum_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bolt.json rename to src/generated/resources/data/basemetals/recipe/platinum_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_boots.json b/src/generated/resources/data/basemetals/recipe/platinum_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_boots.json rename to src/generated/resources/data/basemetals/recipe/platinum_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/platinum_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bow.json b/src/generated/resources/data/basemetals/recipe/platinum_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bow.json rename to src/generated/resources/data/basemetals/recipe/platinum_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_button.json b/src/generated/resources/data/basemetals/recipe/platinum_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_button.json rename to src/generated/resources/data/basemetals/recipe/platinum_button.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_button_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json b/src/generated/resources/data/basemetals/recipe/platinum_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_chestplate.json rename to src/generated/resources/data/basemetals/recipe/platinum_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/platinum_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json b/src/generated/resources/data/basemetals/recipe/platinum_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/platinum_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json b/src/generated/resources/data/basemetals/recipe/platinum_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_crossbow.json rename to src/generated/resources/data/basemetals/recipe/platinum_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_door.json b/src/generated/resources/data/basemetals/recipe/platinum_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_door.json rename to src/generated/resources/data/basemetals/recipe/platinum_door.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_door_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json b/src/generated/resources/data/basemetals/recipe/platinum_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/platinum_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_gear.json b/src/generated/resources/data/basemetals/recipe/platinum_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_gear.json rename to src/generated/resources/data/basemetals/recipe/platinum_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_helmet.json b/src/generated/resources/data/basemetals/recipe/platinum_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_helmet.json rename to src/generated/resources/data/basemetals/recipe/platinum_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/platinum_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_hoe.json b/src/generated/resources/data/basemetals/recipe/platinum_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_hoe.json rename to src/generated/resources/data/basemetals/recipe/platinum_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json b/src/generated/resources/data/basemetals/recipe/platinum_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/platinum_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/platinum_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/platinum_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_leggings.json b/src/generated/resources/data/basemetals/recipe/platinum_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_leggings.json rename to src/generated/resources/data/basemetals/recipe/platinum_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/platinum_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_lever.json b/src/generated/resources/data/basemetals/recipe/platinum_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_lever.json rename to src/generated/resources/data/basemetals/recipe/platinum_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json b/src/generated/resources/data/basemetals/recipe/platinum_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_nuggets.json rename to src/generated/resources/data/basemetals/recipe/platinum_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/platinum_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/platinum_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json b/src/generated/resources/data/basemetals/recipe/platinum_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/platinum_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_plate.json b/src/generated/resources/data/basemetals/recipe/platinum_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_plate.json rename to src/generated/resources/data/basemetals/recipe/platinum_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/platinum_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/platinum_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/platinum_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/platinum_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/platinum_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/platinum_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_rod.json b/src/generated/resources/data/basemetals/recipe/platinum_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_rod.json rename to src/generated/resources/data/basemetals/recipe/platinum_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_scythe.json b/src/generated/resources/data/basemetals/recipe/platinum_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_scythe.json rename to src/generated/resources/data/basemetals/recipe/platinum_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shears.json b/src/generated/resources/data/basemetals/recipe/platinum_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_shears.json rename to src/generated/resources/data/basemetals/recipe/platinum_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shield.json b/src/generated/resources/data/basemetals/recipe/platinum_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_shield.json rename to src/generated/resources/data/basemetals/recipe/platinum_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/platinum_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shovel.json b/src/generated/resources/data/basemetals/recipe/platinum_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_shovel.json rename to src/generated/resources/data/basemetals/recipe/platinum_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_slab.json b/src/generated/resources/data/basemetals/recipe/platinum_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_slab.json rename to src/generated/resources/data/basemetals/recipe/platinum_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json b/src/generated/resources/data/basemetals/recipe/platinum_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/platinum_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/platinum_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_stairs.json b/src/generated/resources/data/basemetals/recipe/platinum_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_stairs.json rename to src/generated/resources/data/basemetals/recipe/platinum_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_sword.json b/src/generated/resources/data/basemetals/recipe/platinum_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_sword.json rename to src/generated/resources/data/basemetals/recipe/platinum_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json b/src/generated/resources/data/basemetals/recipe/platinum_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/platinum_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_wall.json b/src/generated/resources/data/basemetals/recipe/platinum_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_wall.json rename to src/generated/resources/data/basemetals/recipe/platinum_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/platinum_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/platinum_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/platinum_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/prismarine_bricks_crushing.json b/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/prismarine_bricks_crushing.json rename to src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/prismarine_crushing.json b/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/prismarine_crushing.json rename to src/generated/resources/data/basemetals/recipe/prismarine_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_arrow.json b/src/generated/resources/data/basemetals/recipe/quartz_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_arrow.json rename to src/generated/resources/data/basemetals/recipe/quartz_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_axe.json b/src/generated/resources/data/basemetals/recipe/quartz_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_axe.json rename to src/generated/resources/data/basemetals/recipe/quartz_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars.json b/src/generated/resources/data/basemetals/recipe/quartz_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bars.json rename to src/generated/resources/data/basemetals/recipe/quartz_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json b/src/generated/resources/data/basemetals/recipe/quartz_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bars_2.json rename to src/generated/resources/data/basemetals/recipe/quartz_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_block_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bolt.json b/src/generated/resources/data/basemetals/recipe/quartz_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bolt.json rename to src/generated/resources/data/basemetals/recipe/quartz_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_boots.json b/src/generated/resources/data/basemetals/recipe/quartz_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_boots.json rename to src/generated/resources/data/basemetals/recipe/quartz_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bow.json b/src/generated/resources/data/basemetals/recipe/quartz_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bow.json rename to src/generated/resources/data/basemetals/recipe/quartz_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_button.json b/src/generated/resources/data/basemetals/recipe/quartz_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_button.json rename to src/generated/resources/data/basemetals/recipe/quartz_button.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_button_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json b/src/generated/resources/data/basemetals/recipe/quartz_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_chestplate.json rename to src/generated/resources/data/basemetals/recipe/quartz_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json b/src/generated/resources/data/basemetals/recipe/quartz_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/quartz_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json b/src/generated/resources/data/basemetals/recipe/quartz_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_crossbow.json rename to src/generated/resources/data/basemetals/recipe/quartz_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_crushing.json rename to src/generated/resources/data/basemetals/recipe/quartz_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_door.json b/src/generated/resources/data/basemetals/recipe/quartz_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_door.json rename to src/generated/resources/data/basemetals/recipe/quartz_door.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_door_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json b/src/generated/resources/data/basemetals/recipe/quartz_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/quartz_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_gear.json b/src/generated/resources/data/basemetals/recipe/quartz_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_gear.json rename to src/generated/resources/data/basemetals/recipe/quartz_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_helmet.json b/src/generated/resources/data/basemetals/recipe/quartz_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_helmet.json rename to src/generated/resources/data/basemetals/recipe/quartz_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_hoe.json b/src/generated/resources/data/basemetals/recipe/quartz_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_hoe.json rename to src/generated/resources/data/basemetals/recipe/quartz_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json b/src/generated/resources/data/basemetals/recipe/quartz_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/quartz_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_ingot.json b/src/generated/resources/data/basemetals/recipe/quartz_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_ingot.json rename to src/generated/resources/data/basemetals/recipe/quartz_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_leggings.json b/src/generated/resources/data/basemetals/recipe/quartz_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_leggings.json rename to src/generated/resources/data/basemetals/recipe/quartz_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_lever.json b/src/generated/resources/data/basemetals/recipe/quartz_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_lever.json rename to src/generated/resources/data/basemetals/recipe/quartz_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_nugget.json b/src/generated/resources/data/basemetals/recipe/quartz_nugget.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_nugget.json rename to src/generated/resources/data/basemetals/recipe/quartz_nugget.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json b/src/generated/resources/data/basemetals/recipe/quartz_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/quartz_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/quartz_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/quartz_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/quartz_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/quartz_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/quartz_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_rod.json b/src/generated/resources/data/basemetals/recipe/quartz_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_rod.json rename to src/generated/resources/data/basemetals/recipe/quartz_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_scythe.json b/src/generated/resources/data/basemetals/recipe/quartz_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_scythe.json rename to src/generated/resources/data/basemetals/recipe/quartz_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shears.json b/src/generated/resources/data/basemetals/recipe/quartz_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_shears.json rename to src/generated/resources/data/basemetals/recipe/quartz_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shield.json b/src/generated/resources/data/basemetals/recipe/quartz_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_shield.json rename to src/generated/resources/data/basemetals/recipe/quartz_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shovel.json b/src/generated/resources/data/basemetals/recipe/quartz_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_shovel.json rename to src/generated/resources/data/basemetals/recipe/quartz_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_slab_crushing.json rename to src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json b/src/generated/resources/data/basemetals/recipe/quartz_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/quartz_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/quartz_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/quartz_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_sword.json b/src/generated/resources/data/basemetals/recipe/quartz_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_sword.json rename to src/generated/resources/data/basemetals/recipe/quartz_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json b/src/generated/resources/data/basemetals/recipe/quartz_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/quartz_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_wall.json b/src/generated/resources/data/basemetals/recipe/quartz_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_wall.json rename to src/generated/resources/data/basemetals/recipe/quartz_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/quartz_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/quartz_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/quartz_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/rail.json b/src/generated/resources/data/basemetals/recipe/rail.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/rail.json rename to src/generated/resources/data/basemetals/recipe/rail.json diff --git a/src/generated/resources/data/basemetals/recipes/red_sandstone_crushing.json b/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/red_sandstone_crushing.json rename to src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/red_sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/red_sandstone_slab_crushing.json rename to src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/redstone_block_crushing.json b/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/redstone_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/recipe/redstone_from_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/redstone_from_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/redstone_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/redstone_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json b/src/generated/resources/data/basemetals/recipe/redstone_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/redstone_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/sandstone_crushing.json b/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/sandstone_crushing.json rename to src/generated/resources/data/basemetals/recipe/sandstone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/sandstone_slab_crushing.json rename to src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/sea_lantern_crushing.json b/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/sea_lantern_crushing.json rename to src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_arrow.json b/src/generated/resources/data/basemetals/recipe/silver_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_arrow.json rename to src/generated/resources/data/basemetals/recipe/silver_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_axe.json b/src/generated/resources/data/basemetals/recipe/silver_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_axe.json rename to src/generated/resources/data/basemetals/recipe/silver_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars.json b/src/generated/resources/data/basemetals/recipe/silver_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bars.json rename to src/generated/resources/data/basemetals/recipe/silver_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars_2.json b/src/generated/resources/data/basemetals/recipe/silver_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bars_2.json rename to src/generated/resources/data/basemetals/recipe/silver_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_block.json b/src/generated/resources/data/basemetals/recipe/silver_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_block.json rename to src/generated/resources/data/basemetals/recipe/silver_block.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_block_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/silver_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json b/src/generated/resources/data/basemetals/recipe/silver_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/silver_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bolt.json b/src/generated/resources/data/basemetals/recipe/silver_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bolt.json rename to src/generated/resources/data/basemetals/recipe/silver_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_boots.json b/src/generated/resources/data/basemetals/recipe/silver_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_boots.json rename to src/generated/resources/data/basemetals/recipe/silver_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/silver_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bow.json b/src/generated/resources/data/basemetals/recipe/silver_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bow.json rename to src/generated/resources/data/basemetals/recipe/silver_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_button.json b/src/generated/resources/data/basemetals/recipe/silver_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_button.json rename to src/generated/resources/data/basemetals/recipe/silver_button.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_button_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_chestplate.json b/src/generated/resources/data/basemetals/recipe/silver_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_chestplate.json rename to src/generated/resources/data/basemetals/recipe/silver_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/silver_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json b/src/generated/resources/data/basemetals/recipe/silver_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/silver_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_crossbow.json b/src/generated/resources/data/basemetals/recipe/silver_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_crossbow.json rename to src/generated/resources/data/basemetals/recipe/silver_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_door.json b/src/generated/resources/data/basemetals/recipe/silver_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_door.json rename to src/generated/resources/data/basemetals/recipe/silver_door.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_door_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json b/src/generated/resources/data/basemetals/recipe/silver_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/silver_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_gear.json b/src/generated/resources/data/basemetals/recipe/silver_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_gear.json rename to src/generated/resources/data/basemetals/recipe/silver_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_helmet.json b/src/generated/resources/data/basemetals/recipe/silver_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_helmet.json rename to src/generated/resources/data/basemetals/recipe/silver_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/silver_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_hoe.json b/src/generated/resources/data/basemetals/recipe/silver_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_hoe.json rename to src/generated/resources/data/basemetals/recipe/silver_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json b/src/generated/resources/data/basemetals/recipe/silver_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/silver_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/silver_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/silver_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_leggings.json b/src/generated/resources/data/basemetals/recipe/silver_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_leggings.json rename to src/generated/resources/data/basemetals/recipe/silver_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/silver_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_lever.json b/src/generated/resources/data/basemetals/recipe/silver_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_lever.json rename to src/generated/resources/data/basemetals/recipe/silver_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_nuggets.json b/src/generated/resources/data/basemetals/recipe/silver_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_nuggets.json rename to src/generated/resources/data/basemetals/recipe/silver_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/silver_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/silver_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/silver_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json b/src/generated/resources/data/basemetals/recipe/silver_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/silver_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_plate.json b/src/generated/resources/data/basemetals/recipe/silver_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_plate.json rename to src/generated/resources/data/basemetals/recipe/silver_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/silver_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/silver_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/silver_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/silver_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/silver_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/silver_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/silver_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/silver_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_rod.json b/src/generated/resources/data/basemetals/recipe/silver_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_rod.json rename to src/generated/resources/data/basemetals/recipe/silver_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_scythe.json b/src/generated/resources/data/basemetals/recipe/silver_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_scythe.json rename to src/generated/resources/data/basemetals/recipe/silver_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_shears.json b/src/generated/resources/data/basemetals/recipe/silver_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_shears.json rename to src/generated/resources/data/basemetals/recipe/silver_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_shield.json b/src/generated/resources/data/basemetals/recipe/silver_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_shield.json rename to src/generated/resources/data/basemetals/recipe/silver_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/silver_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_shovel.json b/src/generated/resources/data/basemetals/recipe/silver_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_shovel.json rename to src/generated/resources/data/basemetals/recipe/silver_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_slab.json b/src/generated/resources/data/basemetals/recipe/silver_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_slab.json rename to src/generated/resources/data/basemetals/recipe/silver_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json b/src/generated/resources/data/basemetals/recipe/silver_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/silver_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/silver_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_stairs.json b/src/generated/resources/data/basemetals/recipe/silver_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_stairs.json rename to src/generated/resources/data/basemetals/recipe/silver_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_sword.json b/src/generated/resources/data/basemetals/recipe/silver_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_sword.json rename to src/generated/resources/data/basemetals/recipe/silver_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json b/src/generated/resources/data/basemetals/recipe/silver_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/silver_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_wall.json b/src/generated/resources/data/basemetals/recipe/silver_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_wall.json rename to src/generated/resources/data/basemetals/recipe/silver_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/silver_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/silver_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/silver_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/slime_block_crushing.json b/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/slime_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/slime_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json b/src/generated/resources/data/basemetals/recipe/starsteel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_arrow.json rename to src/generated/resources/data/basemetals/recipe/starsteel_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_axe.json b/src/generated/resources/data/basemetals/recipe/starsteel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_axe.json rename to src/generated/resources/data/basemetals/recipe/starsteel_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars.json b/src/generated/resources/data/basemetals/recipe/starsteel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bars.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json b/src/generated/resources/data/basemetals/recipe/starsteel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block.json b/src/generated/resources/data/basemetals/recipe/starsteel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_block.json rename to src/generated/resources/data/basemetals/recipe/starsteel_block.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/starsteel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/starsteel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json b/src/generated/resources/data/basemetals/recipe/starsteel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bolt.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_boots.json b/src/generated/resources/data/basemetals/recipe/starsteel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_boots.json rename to src/generated/resources/data/basemetals/recipe/starsteel_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/starsteel_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bow.json b/src/generated/resources/data/basemetals/recipe/starsteel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bow.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_button.json b/src/generated/resources/data/basemetals/recipe/starsteel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_button.json rename to src/generated/resources/data/basemetals/recipe/starsteel_button.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json rename to src/generated/resources/data/basemetals/recipe/starsteel_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/starsteel_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/starsteel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json b/src/generated/resources/data/basemetals/recipe/starsteel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json rename to src/generated/resources/data/basemetals/recipe/starsteel_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_door.json b/src/generated/resources/data/basemetals/recipe/starsteel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_door.json rename to src/generated/resources/data/basemetals/recipe/starsteel_door.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/starsteel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/starsteel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_gear.json b/src/generated/resources/data/basemetals/recipe/starsteel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_gear.json rename to src/generated/resources/data/basemetals/recipe/starsteel_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json b/src/generated/resources/data/basemetals/recipe/starsteel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_helmet.json rename to src/generated/resources/data/basemetals/recipe/starsteel_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/starsteel_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json b/src/generated/resources/data/basemetals/recipe/starsteel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_hoe.json rename to src/generated/resources/data/basemetals/recipe/starsteel_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/starsteel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/starsteel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/starsteel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json b/src/generated/resources/data/basemetals/recipe/starsteel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_leggings.json rename to src/generated/resources/data/basemetals/recipe/starsteel_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/starsteel_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_lever.json b/src/generated/resources/data/basemetals/recipe/starsteel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_lever.json rename to src/generated/resources/data/basemetals/recipe/starsteel_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json b/src/generated/resources/data/basemetals/recipe/starsteel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json rename to src/generated/resources/data/basemetals/recipe/starsteel_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/starsteel_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/starsteel_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/starsteel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_plate.json b/src/generated/resources/data/basemetals/recipe/starsteel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_plate.json rename to src/generated/resources/data/basemetals/recipe/starsteel_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/starsteel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/starsteel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/starsteel_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/starsteel_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/starsteel_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_rod.json b/src/generated/resources/data/basemetals/recipe/starsteel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_rod.json rename to src/generated/resources/data/basemetals/recipe/starsteel_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json b/src/generated/resources/data/basemetals/recipe/starsteel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_scythe.json rename to src/generated/resources/data/basemetals/recipe/starsteel_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shears.json b/src/generated/resources/data/basemetals/recipe/starsteel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_shears.json rename to src/generated/resources/data/basemetals/recipe/starsteel_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shield.json b/src/generated/resources/data/basemetals/recipe/starsteel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_shield.json rename to src/generated/resources/data/basemetals/recipe/starsteel_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/starsteel_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json b/src/generated/resources/data/basemetals/recipe/starsteel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_shovel.json rename to src/generated/resources/data/basemetals/recipe/starsteel_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_slab.json b/src/generated/resources/data/basemetals/recipe/starsteel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_slab.json rename to src/generated/resources/data/basemetals/recipe/starsteel_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/starsteel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/starsteel_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json b/src/generated/resources/data/basemetals/recipe/starsteel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_stairs.json rename to src/generated/resources/data/basemetals/recipe/starsteel_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_sword.json b/src/generated/resources/data/basemetals/recipe/starsteel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_sword.json rename to src/generated/resources/data/basemetals/recipe/starsteel_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/starsteel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_wall.json b/src/generated/resources/data/basemetals/recipe/starsteel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_wall.json rename to src/generated/resources/data/basemetals/recipe/starsteel_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/starsteel_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/starsteel_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_anvil.json b/src/generated/resources/data/basemetals/recipe/steel_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_anvil.json rename to src/generated/resources/data/basemetals/recipe/steel_anvil.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_arrow.json b/src/generated/resources/data/basemetals/recipe/steel_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_arrow.json rename to src/generated/resources/data/basemetals/recipe/steel_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_axe.json b/src/generated/resources/data/basemetals/recipe/steel_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_axe.json rename to src/generated/resources/data/basemetals/recipe/steel_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars.json b/src/generated/resources/data/basemetals/recipe/steel_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bars.json rename to src/generated/resources/data/basemetals/recipe/steel_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars_2.json b/src/generated/resources/data/basemetals/recipe/steel_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bars_2.json rename to src/generated/resources/data/basemetals/recipe/steel_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend.json b/src/generated/resources/data/basemetals/recipe/steel_blend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_blend.json rename to src/generated/resources/data/basemetals/recipe/steel_blend.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/steel_blend_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json rename to src/generated/resources/data/basemetals/recipe/steel_blend_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_blend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_blend_smelting.json rename to src/generated/resources/data/basemetals/recipe/steel_blend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_block.json b/src/generated/resources/data/basemetals/recipe/steel_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_block.json rename to src/generated/resources/data/basemetals/recipe/steel_block.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/steel_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/steel_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/steel_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bolt.json b/src/generated/resources/data/basemetals/recipe/steel_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bolt.json rename to src/generated/resources/data/basemetals/recipe/steel_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_boots.json b/src/generated/resources/data/basemetals/recipe/steel_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_boots.json rename to src/generated/resources/data/basemetals/recipe/steel_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/steel_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bow.json b/src/generated/resources/data/basemetals/recipe/steel_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bow.json rename to src/generated/resources/data/basemetals/recipe/steel_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_button.json b/src/generated/resources/data/basemetals/recipe/steel_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_button.json rename to src/generated/resources/data/basemetals/recipe/steel_button.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_chestplate.json b/src/generated/resources/data/basemetals/recipe/steel_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_chestplate.json rename to src/generated/resources/data/basemetals/recipe/steel_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/steel_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/steel_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/steel_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_crossbow.json b/src/generated/resources/data/basemetals/recipe/steel_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_crossbow.json rename to src/generated/resources/data/basemetals/recipe/steel_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_door.json b/src/generated/resources/data/basemetals/recipe/steel_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_door.json rename to src/generated/resources/data/basemetals/recipe/steel_door.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/steel_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/steel_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_gear.json b/src/generated/resources/data/basemetals/recipe/steel_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_gear.json rename to src/generated/resources/data/basemetals/recipe/steel_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_helmet.json b/src/generated/resources/data/basemetals/recipe/steel_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_helmet.json rename to src/generated/resources/data/basemetals/recipe/steel_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/steel_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_hoe.json b/src/generated/resources/data/basemetals/recipe/steel_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_hoe.json rename to src/generated/resources/data/basemetals/recipe/steel_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/steel_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/steel_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/steel_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/steel_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_leggings.json b/src/generated/resources/data/basemetals/recipe/steel_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_leggings.json rename to src/generated/resources/data/basemetals/recipe/steel_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/steel_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_lever.json b/src/generated/resources/data/basemetals/recipe/steel_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_lever.json rename to src/generated/resources/data/basemetals/recipe/steel_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_nuggets.json b/src/generated/resources/data/basemetals/recipe/steel_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_nuggets.json rename to src/generated/resources/data/basemetals/recipe/steel_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/steel_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/steel_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_plate.json b/src/generated/resources/data/basemetals/recipe/steel_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_plate.json rename to src/generated/resources/data/basemetals/recipe/steel_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/steel_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/steel_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/steel_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/steel_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/steel_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_rod.json b/src/generated/resources/data/basemetals/recipe/steel_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_rod.json rename to src/generated/resources/data/basemetals/recipe/steel_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_scythe.json b/src/generated/resources/data/basemetals/recipe/steel_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_scythe.json rename to src/generated/resources/data/basemetals/recipe/steel_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_shears.json b/src/generated/resources/data/basemetals/recipe/steel_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_shears.json rename to src/generated/resources/data/basemetals/recipe/steel_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_shield.json b/src/generated/resources/data/basemetals/recipe/steel_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_shield.json rename to src/generated/resources/data/basemetals/recipe/steel_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/steel_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_shovel.json b/src/generated/resources/data/basemetals/recipe/steel_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_shovel.json rename to src/generated/resources/data/basemetals/recipe/steel_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_slab.json b/src/generated/resources/data/basemetals/recipe/steel_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_slab.json rename to src/generated/resources/data/basemetals/recipe/steel_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallblend.json b/src/generated/resources/data/basemetals/recipe/steel_smallblend.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_smallblend.json rename to src/generated/resources/data/basemetals/recipe/steel_smallblend.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_smallblend_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_smallblend_smelting.json rename to src/generated/resources/data/basemetals/recipe/steel_smallblend_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/steel_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/steel_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/steel_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_stairs.json b/src/generated/resources/data/basemetals/recipe/steel_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_stairs.json rename to src/generated/resources/data/basemetals/recipe/steel_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_sword.json b/src/generated/resources/data/basemetals/recipe/steel_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_sword.json rename to src/generated/resources/data/basemetals/recipe/steel_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/steel_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/steel_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_wall.json b/src/generated/resources/data/basemetals/recipe/steel_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_wall.json rename to src/generated/resources/data/basemetals/recipe/steel_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/steel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/steel_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/steel_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_anvil.json b/src/generated/resources/data/basemetals/recipe/stone_anvil.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_anvil.json rename to src/generated/resources/data/basemetals/recipe/stone_anvil.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_brick_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_brick_slab_crushing.json rename to src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_bricks_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_bricks_crushing.json rename to src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json b/src/generated/resources/data/basemetals/recipe/stone_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/stone_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_crushing.json rename to src/generated/resources/data/basemetals/recipe/stone_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_scythe.json b/src/generated/resources/data/basemetals/recipe/stone_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_scythe.json rename to src/generated/resources/data/basemetals/recipe/stone_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/stone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/stone_slab_crushing.json rename to src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/sugar_cane_crushing.json b/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/sugar_cane_crushing.json rename to src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_arrow.json b/src/generated/resources/data/basemetals/recipe/tin_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_arrow.json rename to src/generated/resources/data/basemetals/recipe/tin_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_axe.json b/src/generated/resources/data/basemetals/recipe/tin_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_axe.json rename to src/generated/resources/data/basemetals/recipe/tin_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars.json b/src/generated/resources/data/basemetals/recipe/tin_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bars.json rename to src/generated/resources/data/basemetals/recipe/tin_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars_2.json b/src/generated/resources/data/basemetals/recipe/tin_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bars_2.json rename to src/generated/resources/data/basemetals/recipe/tin_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_block.json b/src/generated/resources/data/basemetals/recipe/tin_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_block.json rename to src/generated/resources/data/basemetals/recipe/tin_block.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_block_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/tin_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json b/src/generated/resources/data/basemetals/recipe/tin_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/tin_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bolt.json b/src/generated/resources/data/basemetals/recipe/tin_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bolt.json rename to src/generated/resources/data/basemetals/recipe/tin_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_boots.json b/src/generated/resources/data/basemetals/recipe/tin_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_boots.json rename to src/generated/resources/data/basemetals/recipe/tin_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/tin_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bow.json b/src/generated/resources/data/basemetals/recipe/tin_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bow.json rename to src/generated/resources/data/basemetals/recipe/tin_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_button.json b/src/generated/resources/data/basemetals/recipe/tin_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_button.json rename to src/generated/resources/data/basemetals/recipe/tin_button.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_button_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_chestplate.json b/src/generated/resources/data/basemetals/recipe/tin_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_chestplate.json rename to src/generated/resources/data/basemetals/recipe/tin_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/tin_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json b/src/generated/resources/data/basemetals/recipe/tin_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/tin_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_crossbow.json b/src/generated/resources/data/basemetals/recipe/tin_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_crossbow.json rename to src/generated/resources/data/basemetals/recipe/tin_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_door.json b/src/generated/resources/data/basemetals/recipe/tin_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_door.json rename to src/generated/resources/data/basemetals/recipe/tin_door.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_door_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json b/src/generated/resources/data/basemetals/recipe/tin_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/tin_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_gear.json b/src/generated/resources/data/basemetals/recipe/tin_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_gear.json rename to src/generated/resources/data/basemetals/recipe/tin_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_helmet.json b/src/generated/resources/data/basemetals/recipe/tin_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_helmet.json rename to src/generated/resources/data/basemetals/recipe/tin_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/tin_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_hoe.json b/src/generated/resources/data/basemetals/recipe/tin_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_hoe.json rename to src/generated/resources/data/basemetals/recipe/tin_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json b/src/generated/resources/data/basemetals/recipe/tin_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/tin_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/tin_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/tin_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_leggings.json b/src/generated/resources/data/basemetals/recipe/tin_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_leggings.json rename to src/generated/resources/data/basemetals/recipe/tin_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/tin_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_lever.json b/src/generated/resources/data/basemetals/recipe/tin_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_lever.json rename to src/generated/resources/data/basemetals/recipe/tin_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_nuggets.json b/src/generated/resources/data/basemetals/recipe/tin_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_nuggets.json rename to src/generated/resources/data/basemetals/recipe/tin_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/tin_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/tin_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/tin_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json b/src/generated/resources/data/basemetals/recipe/tin_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/tin_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_plate.json b/src/generated/resources/data/basemetals/recipe/tin_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_plate.json rename to src/generated/resources/data/basemetals/recipe/tin_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/tin_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/tin_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/tin_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/tin_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/tin_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/tin_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/tin_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/tin_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_rod.json b/src/generated/resources/data/basemetals/recipe/tin_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_rod.json rename to src/generated/resources/data/basemetals/recipe/tin_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_scythe.json b/src/generated/resources/data/basemetals/recipe/tin_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_scythe.json rename to src/generated/resources/data/basemetals/recipe/tin_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_shears.json b/src/generated/resources/data/basemetals/recipe/tin_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_shears.json rename to src/generated/resources/data/basemetals/recipe/tin_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_shield.json b/src/generated/resources/data/basemetals/recipe/tin_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_shield.json rename to src/generated/resources/data/basemetals/recipe/tin_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/tin_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_shovel.json b/src/generated/resources/data/basemetals/recipe/tin_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_shovel.json rename to src/generated/resources/data/basemetals/recipe/tin_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_slab.json b/src/generated/resources/data/basemetals/recipe/tin_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_slab.json rename to src/generated/resources/data/basemetals/recipe/tin_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json b/src/generated/resources/data/basemetals/recipe/tin_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/tin_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/tin_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_stairs.json b/src/generated/resources/data/basemetals/recipe/tin_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_stairs.json rename to src/generated/resources/data/basemetals/recipe/tin_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_sword.json b/src/generated/resources/data/basemetals/recipe/tin_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_sword.json rename to src/generated/resources/data/basemetals/recipe/tin_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json b/src/generated/resources/data/basemetals/recipe/tin_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/tin_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_wall.json b/src/generated/resources/data/basemetals/recipe/tin_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_wall.json rename to src/generated/resources/data/basemetals/recipe/tin_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/tin_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tin_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/tin_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/tripwire_hook.json b/src/generated/resources/data/basemetals/recipe/tripwire_hook.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/tripwire_hook.json rename to src/generated/resources/data/basemetals/recipe/tripwire_hook.json diff --git a/src/generated/resources/data/basemetals/recipe/vanilla_copper_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/vanilla_copper_trapdoor_recycling.json new file mode 100644 index 000000000..597fbb9fb --- /dev/null +++ b/src/generated/resources/data/basemetals/recipe/vanilla_copper_trapdoor_recycling.json @@ -0,0 +1,12 @@ +{ + "type": "basemetals:legacy_smelting", + "cookingtime": 200, + "experience": 0.5, + "ingredient": { + "item": "minecraft:copper_trapdoor" + }, + "result": { + "count": 3, + "id": "minecraft:copper_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json b/src/generated/resources/data/basemetals/recipe/wood_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/wood_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/wood_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/wood_scythe.json b/src/generated/resources/data/basemetals/recipe/wood_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/wood_scythe.json rename to src/generated/resources/data/basemetals/recipe/wood_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_arrow.json b/src/generated/resources/data/basemetals/recipe/zinc_arrow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_arrow.json rename to src/generated/resources/data/basemetals/recipe/zinc_arrow.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_arrow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_arrow_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_arrow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_axe.json b/src/generated/resources/data/basemetals/recipe/zinc_axe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_axe.json rename to src/generated/resources/data/basemetals/recipe/zinc_axe.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_axe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_axe_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_axe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars.json b/src/generated/resources/data/basemetals/recipe/zinc_bars.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bars.json rename to src/generated/resources/data/basemetals/recipe/zinc_bars.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json b/src/generated/resources/data/basemetals/recipe/zinc_bars_2.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bars_2.json rename to src/generated/resources/data/basemetals/recipe/zinc_bars_2.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_bars_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bars_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_bars_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block.json b/src/generated/resources/data/basemetals/recipe/zinc_block.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_block.json rename to src/generated/resources/data/basemetals/recipe/zinc_block.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_block_crushing.json rename to src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json b/src/generated/resources/data/basemetals/recipe/zinc_block_ingot.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json rename to src/generated/resources/data/basemetals/recipe/zinc_block_ingot.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bolt.json b/src/generated/resources/data/basemetals/recipe/zinc_bolt.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bolt.json rename to src/generated/resources/data/basemetals/recipe/zinc_bolt.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_bolt_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bolt_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_bolt_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_boots.json b/src/generated/resources/data/basemetals/recipe/zinc_boots.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_boots.json rename to src/generated/resources/data/basemetals/recipe/zinc_boots.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_boots_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_boots_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/zinc_boots_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_boots_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_boots_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_boots_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bow.json b/src/generated/resources/data/basemetals/recipe/zinc_bow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bow.json rename to src/generated/resources/data/basemetals/recipe/zinc_bow.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_bow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_bow_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_bow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_button.json b/src/generated/resources/data/basemetals/recipe/zinc_button.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_button.json rename to src/generated/resources/data/basemetals/recipe/zinc_button.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_button_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_button_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_button_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_button_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json b/src/generated/resources/data/basemetals/recipe/zinc_chestplate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_chestplate.json rename to src/generated/resources/data/basemetals/recipe/zinc_chestplate.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_chestplate_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_chestplate_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/zinc_chestplate_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_chestplate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_chestplate_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_chestplate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json b/src/generated/resources/data/basemetals/recipe/zinc_crackhammer.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json rename to src/generated/resources/data/basemetals/recipe/zinc_crackhammer.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_crackhammer_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_crackhammer_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_crackhammer_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json b/src/generated/resources/data/basemetals/recipe/zinc_crossbow.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_crossbow.json rename to src/generated/resources/data/basemetals/recipe/zinc_crossbow.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_crossbow_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_crossbow_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_crossbow_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_door.json b/src/generated/resources/data/basemetals/recipe/zinc_door.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_door.json rename to src/generated/resources/data/basemetals/recipe/zinc_door.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_door_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_door_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_door_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_door_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json b/src/generated/resources/data/basemetals/recipe/zinc_fishingrod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json rename to src/generated/resources/data/basemetals/recipe/zinc_fishingrod.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_gear.json b/src/generated/resources/data/basemetals/recipe/zinc_gear.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_gear.json rename to src/generated/resources/data/basemetals/recipe/zinc_gear.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_gear_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_gear_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_gear_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_helmet.json b/src/generated/resources/data/basemetals/recipe/zinc_helmet.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_helmet.json rename to src/generated/resources/data/basemetals/recipe/zinc_helmet.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_helmet_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_helmet_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/zinc_helmet_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_helmet_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_helmet_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_helmet_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_hoe.json b/src/generated/resources/data/basemetals/recipe/zinc_hoe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_hoe.json rename to src/generated/resources/data/basemetals/recipe/zinc_hoe.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_hoe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_hoe_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_hoe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json b/src/generated/resources/data/basemetals/recipe/zinc_horsearmor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json rename to src/generated/resources/data/basemetals/recipe/zinc_horsearmor.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_ingot_crushing.json rename to src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/zinc_ingot_from_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json rename to src/generated/resources/data/basemetals/recipe/zinc_ingot_from_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_leggings.json b/src/generated/resources/data/basemetals/recipe/zinc_leggings.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_leggings.json rename to src/generated/resources/data/basemetals/recipe/zinc_leggings.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_leggings_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_leggings_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/zinc_leggings_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_leggings_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_leggings_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_leggings_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_lever.json b/src/generated/resources/data/basemetals/recipe/zinc_lever.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_lever.json rename to src/generated/resources/data/basemetals/recipe/zinc_lever.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_lever_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_lever_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_lever_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_nugget_crushing.json rename to src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json b/src/generated/resources/data/basemetals/recipe/zinc_nuggets.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_nuggets.json rename to src/generated/resources/data/basemetals/recipe/zinc_nuggets.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_ore_blasting.json rename to src/generated/resources/data/basemetals/recipe/zinc_ore_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_ore_crushing.json rename to src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_ore_smelting.json rename to src/generated/resources/data/basemetals/recipe/zinc_ore_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json b/src/generated/resources/data/basemetals/recipe/zinc_pickaxe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json rename to src/generated/resources/data/basemetals/recipe/zinc_pickaxe.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_pickaxe_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_pickaxe_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_pickaxe_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_plate.json b/src/generated/resources/data/basemetals/recipe/zinc_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_plate.json rename to src/generated/resources/data/basemetals/recipe/zinc_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/zinc_powder_from_small.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json rename to src/generated/resources/data/basemetals/recipe/zinc_powder_from_small.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_powder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_powder_smelting.json rename to src/generated/resources/data/basemetals/recipe/zinc_powder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json rename to src/generated/resources/data/basemetals/recipe/zinc_pressure_plate.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_pressure_plate_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_pressure_plate_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_blasting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_raw_blasting.json rename to src/generated/resources/data/basemetals/recipe/zinc_raw_blasting.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_raw_crushing.json rename to src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_raw_smelting.json rename to src/generated/resources/data/basemetals/recipe/zinc_raw_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_rod.json b/src/generated/resources/data/basemetals/recipe/zinc_rod.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_rod.json rename to src/generated/resources/data/basemetals/recipe/zinc_rod.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_rod_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_rod_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_rod_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_scythe.json b/src/generated/resources/data/basemetals/recipe/zinc_scythe.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_scythe.json rename to src/generated/resources/data/basemetals/recipe/zinc_scythe.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shears.json b/src/generated/resources/data/basemetals/recipe/zinc_shears.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_shears.json rename to src/generated/resources/data/basemetals/recipe/zinc_shears.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_shears_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_shears_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_shears_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shield.json b/src/generated/resources/data/basemetals/recipe/zinc_shield.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_shield.json rename to src/generated/resources/data/basemetals/recipe/zinc_shield.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_shield_plate_repair.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_shield_plate_repair.json rename to src/generated/resources/data/basemetals/recipe/zinc_shield_plate_repair.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shovel.json b/src/generated/resources/data/basemetals/recipe/zinc_shovel.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_shovel.json rename to src/generated/resources/data/basemetals/recipe/zinc_shovel.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_shovel_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_shovel_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_shovel_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_slab.json b/src/generated/resources/data/basemetals/recipe/zinc_slab.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_slab.json rename to src/generated/resources/data/basemetals/recipe/zinc_slab.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_slab_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_slab_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_slab_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json b/src/generated/resources/data/basemetals/recipe/zinc_smallpowder.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json rename to src/generated/resources/data/basemetals/recipe/zinc_smallpowder.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_smallpowder_smelting.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_smallpowder_smelting.json rename to src/generated/resources/data/basemetals/recipe/zinc_smallpowder_smelting.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_stairs.json b/src/generated/resources/data/basemetals/recipe/zinc_stairs.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_stairs.json rename to src/generated/resources/data/basemetals/recipe/zinc_stairs.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_sword.json b/src/generated/resources/data/basemetals/recipe/zinc_sword.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_sword.json rename to src/generated/resources/data/basemetals/recipe/zinc_sword.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_sword_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_sword_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_sword_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json b/src/generated/resources/data/basemetals/recipe/zinc_trapdoor.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json rename to src/generated/resources/data/basemetals/recipe/zinc_trapdoor.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_trapdoor_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_trapdoor_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_trapdoor_recycling.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_wall.json b/src/generated/resources/data/basemetals/recipe/zinc_wall.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_wall.json rename to src/generated/resources/data/basemetals/recipe/zinc_wall.json diff --git a/src/generated/resources/data/basemetals/recipes/zinc_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_wall_recycling.json similarity index 100% rename from src/generated/resources/data/basemetals/recipes/zinc_wall_recycling.json rename to src/generated/resources/data/basemetals/recipe/zinc_wall_recycling.json diff --git a/src/generated/resources/data/basemetals/registry_manifest.json b/src/generated/resources/data/basemetals/registry_manifest.json index e9ee04000..ec35623fe 100644 --- a/src/generated/resources/data/basemetals/registry_manifest.json +++ b/src/generated/resources/data/basemetals/registry_manifest.json @@ -1735,5 +1735,5 @@ "basemetals:wood", "basemetals:stone" ], - "source": "Base Metals 1.20.6 catalogue" + "source": "Base Metals 1.21.1 catalogue" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/tags/blocks/crackhammer_crushable.json b/src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json similarity index 100% rename from src/generated/resources/data/basemetals/tags/blocks/crackhammer_crushable.json rename to src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json diff --git a/src/generated/resources/data/forge/tags/block/doors/copper.json b/src/generated/resources/data/forge/tags/block/doors/copper.json new file mode 100644 index 000000000..989979572 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/doors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_door", + "minecraft:copper_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/end_stones.json b/src/generated/resources/data/forge/tags/block/end_stones.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/end_stones.json rename to src/generated/resources/data/forge/tags/block/end_stones.json diff --git a/src/generated/resources/data/forge/tags/blocks/netherrack.json b/src/generated/resources/data/forge/tags/block/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/netherrack.json rename to src/generated/resources/data/forge/tags/block/netherrack.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/block/ores.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores.json rename to src/generated/resources/data/forge/tags/block/ores.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/adamantine.json b/src/generated/resources/data/forge/tags/block/ores/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/adamantine.json rename to src/generated/resources/data/forge/tags/block/ores/adamantine.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/antimony.json b/src/generated/resources/data/forge/tags/block/ores/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/antimony.json rename to src/generated/resources/data/forge/tags/block/ores/antimony.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/bismuth.json b/src/generated/resources/data/forge/tags/block/ores/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/bismuth.json rename to src/generated/resources/data/forge/tags/block/ores/bismuth.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/coldiron.json b/src/generated/resources/data/forge/tags/block/ores/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/coldiron.json rename to src/generated/resources/data/forge/tags/block/ores/coldiron.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/copper.json b/src/generated/resources/data/forge/tags/block/ores/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/copper.json rename to src/generated/resources/data/forge/tags/block/ores/copper.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/lead.json b/src/generated/resources/data/forge/tags/block/ores/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/lead.json rename to src/generated/resources/data/forge/tags/block/ores/lead.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/mercury.json b/src/generated/resources/data/forge/tags/block/ores/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/mercury.json rename to src/generated/resources/data/forge/tags/block/ores/mercury.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/nickel.json b/src/generated/resources/data/forge/tags/block/ores/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/nickel.json rename to src/generated/resources/data/forge/tags/block/ores/nickel.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/platinum.json b/src/generated/resources/data/forge/tags/block/ores/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/platinum.json rename to src/generated/resources/data/forge/tags/block/ores/platinum.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/silver.json b/src/generated/resources/data/forge/tags/block/ores/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/silver.json rename to src/generated/resources/data/forge/tags/block/ores/silver.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/starsteel.json b/src/generated/resources/data/forge/tags/block/ores/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/starsteel.json rename to src/generated/resources/data/forge/tags/block/ores/starsteel.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/tin.json b/src/generated/resources/data/forge/tags/block/ores/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/tin.json rename to src/generated/resources/data/forge/tags/block/ores/tin.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/zinc.json b/src/generated/resources/data/forge/tags/block/ores/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/zinc.json rename to src/generated/resources/data/forge/tags/block/ores/zinc.json diff --git a/src/generated/resources/data/forge/tags/block/slabs/copper.json b/src/generated/resources/data/forge/tags/block/slabs/copper.json new file mode 100644 index 000000000..6695810f9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/slabs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_slab", + "minecraft:cut_copper_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/stairs/copper.json b/src/generated/resources/data/forge/tags/block/stairs/copper.json new file mode 100644 index 000000000..96357a57a --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/stairs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_stairs", + "minecraft:cut_copper_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/block/storage_blocks.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks.json rename to src/generated/resources/data/forge/tags/block/storage_blocks.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/adamantine.json b/src/generated/resources/data/forge/tags/block/storage_blocks/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/adamantine.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/adamantine.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/antimony.json b/src/generated/resources/data/forge/tags/block/storage_blocks/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/antimony.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/antimony.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/aquarium.json b/src/generated/resources/data/forge/tags/block/storage_blocks/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/aquarium.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/aquarium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/bismuth.json b/src/generated/resources/data/forge/tags/block/storage_blocks/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/bismuth.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/bismuth.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/brass.json b/src/generated/resources/data/forge/tags/block/storage_blocks/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/brass.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/brass.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/bronze.json b/src/generated/resources/data/forge/tags/block/storage_blocks/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/bronze.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/bronze.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/charcoal.json b/src/generated/resources/data/forge/tags/block/storage_blocks/charcoal.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/charcoal.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/charcoal.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/coldiron.json b/src/generated/resources/data/forge/tags/block/storage_blocks/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/coldiron.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/coldiron.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/block/storage_blocks/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/copper.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cupronickel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/cupronickel.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/diamond.json b/src/generated/resources/data/forge/tags/block/storage_blocks/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/diamond.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/diamond.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/electrum.json b/src/generated/resources/data/forge/tags/block/storage_blocks/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/electrum.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/electrum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/emerald.json b/src/generated/resources/data/forge/tags/block/storage_blocks/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/emerald.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/emerald.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/gold.json b/src/generated/resources/data/forge/tags/block/storage_blocks/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/gold.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/gold.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/invar.json b/src/generated/resources/data/forge/tags/block/storage_blocks/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/invar.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/invar.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/iron.json b/src/generated/resources/data/forge/tags/block/storage_blocks/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/iron.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/iron.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/lead.json b/src/generated/resources/data/forge/tags/block/storage_blocks/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/lead.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/lead.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/mithril.json b/src/generated/resources/data/forge/tags/block/storage_blocks/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/mithril.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/mithril.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/nickel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/nickel.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/nickel.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/obsidian.json b/src/generated/resources/data/forge/tags/block/storage_blocks/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/obsidian.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/obsidian.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/pewter.json b/src/generated/resources/data/forge/tags/block/storage_blocks/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/pewter.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/pewter.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/platinum.json b/src/generated/resources/data/forge/tags/block/storage_blocks/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/platinum.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/platinum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/quartz.json b/src/generated/resources/data/forge/tags/block/storage_blocks/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/quartz.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/quartz.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/block/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/silver.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/starsteel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/starsteel.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/starsteel.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/block/storage_blocks/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/steel.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/tin.json b/src/generated/resources/data/forge/tags/block/storage_blocks/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/tin.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/tin.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json b/src/generated/resources/data/forge/tags/block/storage_blocks/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json rename to src/generated/resources/data/forge/tags/block/storage_blocks/zinc.json diff --git a/src/generated/resources/data/forge/tags/block/trapdoors/copper.json b/src/generated/resources/data/forge/tags/block/trapdoors/copper.json new file mode 100644 index 000000000..0bb1f00b1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/trapdoors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_trapdoor", + "minecraft:copper_trapdoor" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluids/molten_adamantine.json b/src/generated/resources/data/forge/tags/fluid/molten_adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_adamantine.json rename to src/generated/resources/data/forge/tags/fluid/molten_adamantine.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_antimony.json b/src/generated/resources/data/forge/tags/fluid/molten_antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_antimony.json rename to src/generated/resources/data/forge/tags/fluid/molten_antimony.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_aquarium.json b/src/generated/resources/data/forge/tags/fluid/molten_aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_aquarium.json rename to src/generated/resources/data/forge/tags/fluid/molten_aquarium.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_bismuth.json b/src/generated/resources/data/forge/tags/fluid/molten_bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_bismuth.json rename to src/generated/resources/data/forge/tags/fluid/molten_bismuth.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_brass.json b/src/generated/resources/data/forge/tags/fluid/molten_brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_brass.json rename to src/generated/resources/data/forge/tags/fluid/molten_brass.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_bronze.json b/src/generated/resources/data/forge/tags/fluid/molten_bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_bronze.json rename to src/generated/resources/data/forge/tags/fluid/molten_bronze.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_coldiron.json b/src/generated/resources/data/forge/tags/fluid/molten_coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_coldiron.json rename to src/generated/resources/data/forge/tags/fluid/molten_coldiron.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_copper.json b/src/generated/resources/data/forge/tags/fluid/molten_copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_copper.json rename to src/generated/resources/data/forge/tags/fluid/molten_copper.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_cupronickel.json b/src/generated/resources/data/forge/tags/fluid/molten_cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_cupronickel.json rename to src/generated/resources/data/forge/tags/fluid/molten_cupronickel.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_electrum.json b/src/generated/resources/data/forge/tags/fluid/molten_electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_electrum.json rename to src/generated/resources/data/forge/tags/fluid/molten_electrum.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_invar.json b/src/generated/resources/data/forge/tags/fluid/molten_invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_invar.json rename to src/generated/resources/data/forge/tags/fluid/molten_invar.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_lead.json b/src/generated/resources/data/forge/tags/fluid/molten_lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_lead.json rename to src/generated/resources/data/forge/tags/fluid/molten_lead.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_mercury.json b/src/generated/resources/data/forge/tags/fluid/molten_mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_mercury.json rename to src/generated/resources/data/forge/tags/fluid/molten_mercury.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_mithril.json b/src/generated/resources/data/forge/tags/fluid/molten_mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_mithril.json rename to src/generated/resources/data/forge/tags/fluid/molten_mithril.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_nickel.json b/src/generated/resources/data/forge/tags/fluid/molten_nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_nickel.json rename to src/generated/resources/data/forge/tags/fluid/molten_nickel.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_pewter.json b/src/generated/resources/data/forge/tags/fluid/molten_pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_pewter.json rename to src/generated/resources/data/forge/tags/fluid/molten_pewter.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_platinum.json b/src/generated/resources/data/forge/tags/fluid/molten_platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_platinum.json rename to src/generated/resources/data/forge/tags/fluid/molten_platinum.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_silver.json b/src/generated/resources/data/forge/tags/fluid/molten_silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_silver.json rename to src/generated/resources/data/forge/tags/fluid/molten_silver.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_starsteel.json b/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_starsteel.json rename to src/generated/resources/data/forge/tags/fluid/molten_starsteel.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_steel.json b/src/generated/resources/data/forge/tags/fluid/molten_steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_steel.json rename to src/generated/resources/data/forge/tags/fluid/molten_steel.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_tin.json b/src/generated/resources/data/forge/tags/fluid/molten_tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_tin.json rename to src/generated/resources/data/forge/tags/fluid/molten_tin.json diff --git a/src/generated/resources/data/forge/tags/fluids/molten_zinc.json b/src/generated/resources/data/forge/tags/fluid/molten_zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/molten_zinc.json rename to src/generated/resources/data/forge/tags/fluid/molten_zinc.json diff --git a/src/generated/resources/data/forge/tags/items/blends/aquarium.json b/src/generated/resources/data/forge/tags/item/blends/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/aquarium.json rename to src/generated/resources/data/forge/tags/item/blends/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/blends/brass.json b/src/generated/resources/data/forge/tags/item/blends/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/brass.json rename to src/generated/resources/data/forge/tags/item/blends/brass.json diff --git a/src/generated/resources/data/forge/tags/items/blends/bronze.json b/src/generated/resources/data/forge/tags/item/blends/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/bronze.json rename to src/generated/resources/data/forge/tags/item/blends/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/blends/cupronickel.json b/src/generated/resources/data/forge/tags/item/blends/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/cupronickel.json rename to src/generated/resources/data/forge/tags/item/blends/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/blends/diamond.json b/src/generated/resources/data/forge/tags/item/blends/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/diamond.json rename to src/generated/resources/data/forge/tags/item/blends/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/blends/electrum.json b/src/generated/resources/data/forge/tags/item/blends/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/electrum.json rename to src/generated/resources/data/forge/tags/item/blends/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/blends/gold.json b/src/generated/resources/data/forge/tags/item/blends/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/gold.json rename to src/generated/resources/data/forge/tags/item/blends/gold.json diff --git a/src/generated/resources/data/forge/tags/items/blends/invar.json b/src/generated/resources/data/forge/tags/item/blends/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/invar.json rename to src/generated/resources/data/forge/tags/item/blends/invar.json diff --git a/src/generated/resources/data/forge/tags/items/blends/iron.json b/src/generated/resources/data/forge/tags/item/blends/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/iron.json rename to src/generated/resources/data/forge/tags/item/blends/iron.json diff --git a/src/generated/resources/data/forge/tags/items/blends/mithril.json b/src/generated/resources/data/forge/tags/item/blends/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/mithril.json rename to src/generated/resources/data/forge/tags/item/blends/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/blends/pewter.json b/src/generated/resources/data/forge/tags/item/blends/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/pewter.json rename to src/generated/resources/data/forge/tags/item/blends/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/blends/steel.json b/src/generated/resources/data/forge/tags/item/blends/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/blends/steel.json rename to src/generated/resources/data/forge/tags/item/blends/steel.json diff --git a/src/generated/resources/data/forge/tags/items/casings/adamantine.json b/src/generated/resources/data/forge/tags/item/casings/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/adamantine.json rename to src/generated/resources/data/forge/tags/item/casings/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/casings/antimony.json b/src/generated/resources/data/forge/tags/item/casings/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/antimony.json rename to src/generated/resources/data/forge/tags/item/casings/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/casings/bismuth.json b/src/generated/resources/data/forge/tags/item/casings/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/bismuth.json rename to src/generated/resources/data/forge/tags/item/casings/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/casings/coldiron.json b/src/generated/resources/data/forge/tags/item/casings/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/coldiron.json rename to src/generated/resources/data/forge/tags/item/casings/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/casings/nickel.json b/src/generated/resources/data/forge/tags/item/casings/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/nickel.json rename to src/generated/resources/data/forge/tags/item/casings/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/casings/platinum.json b/src/generated/resources/data/forge/tags/item/casings/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/platinum.json rename to src/generated/resources/data/forge/tags/item/casings/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/casings/starsteel.json b/src/generated/resources/data/forge/tags/item/casings/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/starsteel.json rename to src/generated/resources/data/forge/tags/item/casings/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/casings/zinc.json b/src/generated/resources/data/forge/tags/item/casings/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/casings/zinc.json rename to src/generated/resources/data/forge/tags/item/casings/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/adamantine.json b/src/generated/resources/data/forge/tags/item/clumps/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/adamantine.json rename to src/generated/resources/data/forge/tags/item/clumps/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/antimony.json b/src/generated/resources/data/forge/tags/item/clumps/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/antimony.json rename to src/generated/resources/data/forge/tags/item/clumps/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/bismuth.json b/src/generated/resources/data/forge/tags/item/clumps/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/bismuth.json rename to src/generated/resources/data/forge/tags/item/clumps/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/coldiron.json b/src/generated/resources/data/forge/tags/item/clumps/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/coldiron.json rename to src/generated/resources/data/forge/tags/item/clumps/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/nickel.json b/src/generated/resources/data/forge/tags/item/clumps/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/nickel.json rename to src/generated/resources/data/forge/tags/item/clumps/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/platinum.json b/src/generated/resources/data/forge/tags/item/clumps/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/platinum.json rename to src/generated/resources/data/forge/tags/item/clumps/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/starsteel.json b/src/generated/resources/data/forge/tags/item/clumps/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/starsteel.json rename to src/generated/resources/data/forge/tags/item/clumps/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/clumps/zinc.json b/src/generated/resources/data/forge/tags/item/clumps/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/clumps/zinc.json rename to src/generated/resources/data/forge/tags/item/clumps/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/adamantine.json b/src/generated/resources/data/forge/tags/item/crushed_ores/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/adamantine.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/antimony.json b/src/generated/resources/data/forge/tags/item/crushed_ores/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/antimony.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/bismuth.json b/src/generated/resources/data/forge/tags/item/crushed_ores/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/bismuth.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/coldiron.json b/src/generated/resources/data/forge/tags/item/crushed_ores/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/coldiron.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/nickel.json b/src/generated/resources/data/forge/tags/item/crushed_ores/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/nickel.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/platinum.json b/src/generated/resources/data/forge/tags/item/crushed_ores/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/platinum.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/starsteel.json b/src/generated/resources/data/forge/tags/item/crushed_ores/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/starsteel.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/crushed_ores/zinc.json b/src/generated/resources/data/forge/tags/item/crushed_ores/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crushed_ores/zinc.json rename to src/generated/resources/data/forge/tags/item/crushed_ores/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/adamantine.json b/src/generated/resources/data/forge/tags/item/crystals/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/adamantine.json rename to src/generated/resources/data/forge/tags/item/crystals/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/antimony.json b/src/generated/resources/data/forge/tags/item/crystals/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/antimony.json rename to src/generated/resources/data/forge/tags/item/crystals/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/bismuth.json b/src/generated/resources/data/forge/tags/item/crystals/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/bismuth.json rename to src/generated/resources/data/forge/tags/item/crystals/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/coldiron.json b/src/generated/resources/data/forge/tags/item/crystals/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/coldiron.json rename to src/generated/resources/data/forge/tags/item/crystals/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/nickel.json b/src/generated/resources/data/forge/tags/item/crystals/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/nickel.json rename to src/generated/resources/data/forge/tags/item/crystals/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/platinum.json b/src/generated/resources/data/forge/tags/item/crystals/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/platinum.json rename to src/generated/resources/data/forge/tags/item/crystals/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/starsteel.json b/src/generated/resources/data/forge/tags/item/crystals/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/starsteel.json rename to src/generated/resources/data/forge/tags/item/crystals/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/crystals/zinc.json b/src/generated/resources/data/forge/tags/item/crystals/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crystals/zinc.json rename to src/generated/resources/data/forge/tags/item/crystals/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/adamantine.json b/src/generated/resources/data/forge/tags/item/dense_plates/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/adamantine.json rename to src/generated/resources/data/forge/tags/item/dense_plates/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/antimony.json b/src/generated/resources/data/forge/tags/item/dense_plates/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/antimony.json rename to src/generated/resources/data/forge/tags/item/dense_plates/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/bismuth.json b/src/generated/resources/data/forge/tags/item/dense_plates/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/bismuth.json rename to src/generated/resources/data/forge/tags/item/dense_plates/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/coldiron.json b/src/generated/resources/data/forge/tags/item/dense_plates/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/coldiron.json rename to src/generated/resources/data/forge/tags/item/dense_plates/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/nickel.json b/src/generated/resources/data/forge/tags/item/dense_plates/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/nickel.json rename to src/generated/resources/data/forge/tags/item/dense_plates/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/platinum.json b/src/generated/resources/data/forge/tags/item/dense_plates/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/platinum.json rename to src/generated/resources/data/forge/tags/item/dense_plates/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/starsteel.json b/src/generated/resources/data/forge/tags/item/dense_plates/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/starsteel.json rename to src/generated/resources/data/forge/tags/item/dense_plates/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/dense_plates/zinc.json b/src/generated/resources/data/forge/tags/item/dense_plates/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dense_plates/zinc.json rename to src/generated/resources/data/forge/tags/item/dense_plates/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/adamantine.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/adamantine.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/antimony.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/antimony.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/bismuth.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/bismuth.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/coldiron.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/coldiron.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/nickel.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/nickel.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/platinum.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/platinum.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/starsteel.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/starsteel.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/dirty_dusts/zinc.json b/src/generated/resources/data/forge/tags/item/dirty_dusts/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dirty_dusts/zinc.json rename to src/generated/resources/data/forge/tags/item/dirty_dusts/zinc.json diff --git a/src/generated/resources/data/forge/tags/item/doors/copper.json b/src/generated/resources/data/forge/tags/item/doors/copper.json new file mode 100644 index 000000000..989979572 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/doors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_door", + "minecraft:copper_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/item/dusts.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts.json rename to src/generated/resources/data/forge/tags/item/dusts.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/adamant.json b/src/generated/resources/data/forge/tags/item/dusts/adamant.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/adamant.json rename to src/generated/resources/data/forge/tags/item/dusts/adamant.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/adamantine.json b/src/generated/resources/data/forge/tags/item/dusts/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/adamantine.json rename to src/generated/resources/data/forge/tags/item/dusts/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/adamantite.json b/src/generated/resources/data/forge/tags/item/dusts/adamantite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/adamantite.json rename to src/generated/resources/data/forge/tags/item/dusts/adamantite.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/adamantium.json b/src/generated/resources/data/forge/tags/item/dusts/adamantium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/adamantium.json rename to src/generated/resources/data/forge/tags/item/dusts/adamantium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/antimony.json b/src/generated/resources/data/forge/tags/item/dusts/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/antimony.json rename to src/generated/resources/data/forge/tags/item/dusts/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/aquarium.json b/src/generated/resources/data/forge/tags/item/dusts/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/aquarium.json rename to src/generated/resources/data/forge/tags/item/dusts/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/bismuth.json b/src/generated/resources/data/forge/tags/item/dusts/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/bismuth.json rename to src/generated/resources/data/forge/tags/item/dusts/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/brass.json b/src/generated/resources/data/forge/tags/item/dusts/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/brass.json rename to src/generated/resources/data/forge/tags/item/dusts/brass.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/bronze.json b/src/generated/resources/data/forge/tags/item/dusts/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/bronze.json rename to src/generated/resources/data/forge/tags/item/dusts/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/charcoal.json b/src/generated/resources/data/forge/tags/item/dusts/charcoal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/charcoal.json rename to src/generated/resources/data/forge/tags/item/dusts/charcoal.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal.json b/src/generated/resources/data/forge/tags/item/dusts/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/coal.json rename to src/generated/resources/data/forge/tags/item/dusts/coal.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/coldiron.json b/src/generated/resources/data/forge/tags/item/dusts/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/coldiron.json rename to src/generated/resources/data/forge/tags/item/dusts/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper.json b/src/generated/resources/data/forge/tags/item/dusts/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper.json rename to src/generated/resources/data/forge/tags/item/dusts/copper.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cupronickel.json b/src/generated/resources/data/forge/tags/item/dusts/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cupronickel.json rename to src/generated/resources/data/forge/tags/item/dusts/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/diamond.json b/src/generated/resources/data/forge/tags/item/dusts/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/diamond.json rename to src/generated/resources/data/forge/tags/item/dusts/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/electrum.json b/src/generated/resources/data/forge/tags/item/dusts/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/electrum.json rename to src/generated/resources/data/forge/tags/item/dusts/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/emerald.json b/src/generated/resources/data/forge/tags/item/dusts/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/emerald.json rename to src/generated/resources/data/forge/tags/item/dusts/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/gold.json b/src/generated/resources/data/forge/tags/item/dusts/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/gold.json rename to src/generated/resources/data/forge/tags/item/dusts/gold.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/invar.json b/src/generated/resources/data/forge/tags/item/dusts/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/invar.json rename to src/generated/resources/data/forge/tags/item/dusts/invar.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/forge/tags/item/dusts/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron.json rename to src/generated/resources/data/forge/tags/item/dusts/iron.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lapis.json b/src/generated/resources/data/forge/tags/item/dusts/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lapis.json rename to src/generated/resources/data/forge/tags/item/dusts/lapis.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead.json b/src/generated/resources/data/forge/tags/item/dusts/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead.json rename to src/generated/resources/data/forge/tags/item/dusts/lead.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/mercury.json b/src/generated/resources/data/forge/tags/item/dusts/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/mercury.json rename to src/generated/resources/data/forge/tags/item/dusts/mercury.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/mithril.json b/src/generated/resources/data/forge/tags/item/dusts/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/mithril.json rename to src/generated/resources/data/forge/tags/item/dusts/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel.json b/src/generated/resources/data/forge/tags/item/dusts/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel.json rename to src/generated/resources/data/forge/tags/item/dusts/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/obsidian.json b/src/generated/resources/data/forge/tags/item/dusts/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/obsidian.json rename to src/generated/resources/data/forge/tags/item/dusts/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/pewter.json b/src/generated/resources/data/forge/tags/item/dusts/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/pewter.json rename to src/generated/resources/data/forge/tags/item/dusts/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/platinum.json b/src/generated/resources/data/forge/tags/item/dusts/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/platinum.json rename to src/generated/resources/data/forge/tags/item/dusts/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/prismarine.json b/src/generated/resources/data/forge/tags/item/dusts/prismarine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/prismarine.json rename to src/generated/resources/data/forge/tags/item/dusts/prismarine.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/quartz.json b/src/generated/resources/data/forge/tags/item/dusts/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/quartz.json rename to src/generated/resources/data/forge/tags/item/dusts/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/redstone.json b/src/generated/resources/data/forge/tags/item/dusts/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/redstone.json rename to src/generated/resources/data/forge/tags/item/dusts/redstone.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/silver.json b/src/generated/resources/data/forge/tags/item/dusts/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/silver.json rename to src/generated/resources/data/forge/tags/item/dusts/silver.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/starsteel.json b/src/generated/resources/data/forge/tags/item/dusts/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/starsteel.json rename to src/generated/resources/data/forge/tags/item/dusts/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/steel.json b/src/generated/resources/data/forge/tags/item/dusts/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/steel.json rename to src/generated/resources/data/forge/tags/item/dusts/steel.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tin.json b/src/generated/resources/data/forge/tags/item/dusts/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tin.json rename to src/generated/resources/data/forge/tags/item/dusts/tin.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc.json b/src/generated/resources/data/forge/tags/item/dusts/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc.json rename to src/generated/resources/data/forge/tags/item/dusts/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/gears.json b/src/generated/resources/data/forge/tags/item/gears.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears.json rename to src/generated/resources/data/forge/tags/item/gears.json diff --git a/src/generated/resources/data/forge/tags/items/gears/adamantine.json b/src/generated/resources/data/forge/tags/item/gears/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/adamantine.json rename to src/generated/resources/data/forge/tags/item/gears/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/gears/antimony.json b/src/generated/resources/data/forge/tags/item/gears/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/antimony.json rename to src/generated/resources/data/forge/tags/item/gears/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/gears/aquarium.json b/src/generated/resources/data/forge/tags/item/gears/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/aquarium.json rename to src/generated/resources/data/forge/tags/item/gears/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/gears/bismuth.json b/src/generated/resources/data/forge/tags/item/gears/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/bismuth.json rename to src/generated/resources/data/forge/tags/item/gears/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/gears/brass.json b/src/generated/resources/data/forge/tags/item/gears/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/brass.json rename to src/generated/resources/data/forge/tags/item/gears/brass.json diff --git a/src/generated/resources/data/forge/tags/items/gears/bronze.json b/src/generated/resources/data/forge/tags/item/gears/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/bronze.json rename to src/generated/resources/data/forge/tags/item/gears/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/gears/coldiron.json b/src/generated/resources/data/forge/tags/item/gears/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/coldiron.json rename to src/generated/resources/data/forge/tags/item/gears/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/gears/copper.json b/src/generated/resources/data/forge/tags/item/gears/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/copper.json rename to src/generated/resources/data/forge/tags/item/gears/copper.json diff --git a/src/generated/resources/data/forge/tags/items/gears/cupronickel.json b/src/generated/resources/data/forge/tags/item/gears/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/cupronickel.json rename to src/generated/resources/data/forge/tags/item/gears/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/gears/diamond.json b/src/generated/resources/data/forge/tags/item/gears/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/diamond.json rename to src/generated/resources/data/forge/tags/item/gears/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/gears/electrum.json b/src/generated/resources/data/forge/tags/item/gears/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/electrum.json rename to src/generated/resources/data/forge/tags/item/gears/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/gears/emerald.json b/src/generated/resources/data/forge/tags/item/gears/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/emerald.json rename to src/generated/resources/data/forge/tags/item/gears/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/gears/gold.json b/src/generated/resources/data/forge/tags/item/gears/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/gold.json rename to src/generated/resources/data/forge/tags/item/gears/gold.json diff --git a/src/generated/resources/data/forge/tags/items/gears/invar.json b/src/generated/resources/data/forge/tags/item/gears/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/invar.json rename to src/generated/resources/data/forge/tags/item/gears/invar.json diff --git a/src/generated/resources/data/forge/tags/items/gears/iron.json b/src/generated/resources/data/forge/tags/item/gears/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/iron.json rename to src/generated/resources/data/forge/tags/item/gears/iron.json diff --git a/src/generated/resources/data/forge/tags/items/gears/lead.json b/src/generated/resources/data/forge/tags/item/gears/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/lead.json rename to src/generated/resources/data/forge/tags/item/gears/lead.json diff --git a/src/generated/resources/data/forge/tags/items/gears/mithril.json b/src/generated/resources/data/forge/tags/item/gears/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/mithril.json rename to src/generated/resources/data/forge/tags/item/gears/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/gears/nickel.json b/src/generated/resources/data/forge/tags/item/gears/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/nickel.json rename to src/generated/resources/data/forge/tags/item/gears/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/gears/obsidian.json b/src/generated/resources/data/forge/tags/item/gears/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/obsidian.json rename to src/generated/resources/data/forge/tags/item/gears/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/gears/pewter.json b/src/generated/resources/data/forge/tags/item/gears/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/pewter.json rename to src/generated/resources/data/forge/tags/item/gears/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/gears/platinum.json b/src/generated/resources/data/forge/tags/item/gears/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/platinum.json rename to src/generated/resources/data/forge/tags/item/gears/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/gears/quartz.json b/src/generated/resources/data/forge/tags/item/gears/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/quartz.json rename to src/generated/resources/data/forge/tags/item/gears/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/gears/silver.json b/src/generated/resources/data/forge/tags/item/gears/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/silver.json rename to src/generated/resources/data/forge/tags/item/gears/silver.json diff --git a/src/generated/resources/data/forge/tags/items/gears/starsteel.json b/src/generated/resources/data/forge/tags/item/gears/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/starsteel.json rename to src/generated/resources/data/forge/tags/item/gears/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/gears/steel.json b/src/generated/resources/data/forge/tags/item/gears/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/steel.json rename to src/generated/resources/data/forge/tags/item/gears/steel.json diff --git a/src/generated/resources/data/forge/tags/items/gears/stone.json b/src/generated/resources/data/forge/tags/item/gears/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/stone.json rename to src/generated/resources/data/forge/tags/item/gears/stone.json diff --git a/src/generated/resources/data/forge/tags/items/gears/tin.json b/src/generated/resources/data/forge/tags/item/gears/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/tin.json rename to src/generated/resources/data/forge/tags/item/gears/tin.json diff --git a/src/generated/resources/data/forge/tags/items/gears/wood.json b/src/generated/resources/data/forge/tags/item/gears/wood.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/wood.json rename to src/generated/resources/data/forge/tags/item/gears/wood.json diff --git a/src/generated/resources/data/forge/tags/items/gears/zinc.json b/src/generated/resources/data/forge/tags/item/gears/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gears/zinc.json rename to src/generated/resources/data/forge/tags/item/gears/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/item/ingots.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots.json rename to src/generated/resources/data/forge/tags/item/ingots.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/adamant.json b/src/generated/resources/data/forge/tags/item/ingots/adamant.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/adamant.json rename to src/generated/resources/data/forge/tags/item/ingots/adamant.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/adamantine.json b/src/generated/resources/data/forge/tags/item/ingots/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/adamantine.json rename to src/generated/resources/data/forge/tags/item/ingots/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/adamantite.json b/src/generated/resources/data/forge/tags/item/ingots/adamantite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/adamantite.json rename to src/generated/resources/data/forge/tags/item/ingots/adamantite.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/adamantium.json b/src/generated/resources/data/forge/tags/item/ingots/adamantium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/adamantium.json rename to src/generated/resources/data/forge/tags/item/ingots/adamantium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/antimony.json b/src/generated/resources/data/forge/tags/item/ingots/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/antimony.json rename to src/generated/resources/data/forge/tags/item/ingots/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/aquarium.json b/src/generated/resources/data/forge/tags/item/ingots/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/aquarium.json rename to src/generated/resources/data/forge/tags/item/ingots/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/bismuth.json b/src/generated/resources/data/forge/tags/item/ingots/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/bismuth.json rename to src/generated/resources/data/forge/tags/item/ingots/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/brass.json b/src/generated/resources/data/forge/tags/item/ingots/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/brass.json rename to src/generated/resources/data/forge/tags/item/ingots/brass.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/bronze.json b/src/generated/resources/data/forge/tags/item/ingots/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/bronze.json rename to src/generated/resources/data/forge/tags/item/ingots/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/coldiron.json b/src/generated/resources/data/forge/tags/item/ingots/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/coldiron.json rename to src/generated/resources/data/forge/tags/item/ingots/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/copper.json b/src/generated/resources/data/forge/tags/item/ingots/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/copper.json rename to src/generated/resources/data/forge/tags/item/ingots/copper.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/cupronickel.json b/src/generated/resources/data/forge/tags/item/ingots/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/cupronickel.json rename to src/generated/resources/data/forge/tags/item/ingots/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/electrum.json b/src/generated/resources/data/forge/tags/item/ingots/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/electrum.json rename to src/generated/resources/data/forge/tags/item/ingots/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/invar.json b/src/generated/resources/data/forge/tags/item/ingots/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/invar.json rename to src/generated/resources/data/forge/tags/item/ingots/invar.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/lead.json b/src/generated/resources/data/forge/tags/item/ingots/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/lead.json rename to src/generated/resources/data/forge/tags/item/ingots/lead.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/mercury.json b/src/generated/resources/data/forge/tags/item/ingots/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/mercury.json rename to src/generated/resources/data/forge/tags/item/ingots/mercury.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/mithril.json b/src/generated/resources/data/forge/tags/item/ingots/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/mithril.json rename to src/generated/resources/data/forge/tags/item/ingots/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/nickel.json b/src/generated/resources/data/forge/tags/item/ingots/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/nickel.json rename to src/generated/resources/data/forge/tags/item/ingots/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/obsidian.json b/src/generated/resources/data/forge/tags/item/ingots/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/obsidian.json rename to src/generated/resources/data/forge/tags/item/ingots/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/pewter.json b/src/generated/resources/data/forge/tags/item/ingots/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/pewter.json rename to src/generated/resources/data/forge/tags/item/ingots/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/platinum.json b/src/generated/resources/data/forge/tags/item/ingots/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/platinum.json rename to src/generated/resources/data/forge/tags/item/ingots/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/quicksilver.json b/src/generated/resources/data/forge/tags/item/ingots/quicksilver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/quicksilver.json rename to src/generated/resources/data/forge/tags/item/ingots/quicksilver.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/redstone.json b/src/generated/resources/data/forge/tags/item/ingots/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/redstone.json rename to src/generated/resources/data/forge/tags/item/ingots/redstone.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/silver.json b/src/generated/resources/data/forge/tags/item/ingots/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/silver.json rename to src/generated/resources/data/forge/tags/item/ingots/silver.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/starsteel.json b/src/generated/resources/data/forge/tags/item/ingots/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/starsteel.json rename to src/generated/resources/data/forge/tags/item/ingots/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/steel.json b/src/generated/resources/data/forge/tags/item/ingots/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/steel.json rename to src/generated/resources/data/forge/tags/item/ingots/steel.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/tin.json b/src/generated/resources/data/forge/tags/item/ingots/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/tin.json rename to src/generated/resources/data/forge/tags/item/ingots/tin.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/zinc.json b/src/generated/resources/data/forge/tags/item/ingots/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/zinc.json rename to src/generated/resources/data/forge/tags/item/ingots/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/materials/diamond.json b/src/generated/resources/data/forge/tags/item/materials/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/materials/diamond.json rename to src/generated/resources/data/forge/tags/item/materials/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/materials/emerald.json b/src/generated/resources/data/forge/tags/item/materials/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/materials/emerald.json rename to src/generated/resources/data/forge/tags/item/materials/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/materials/gold.json b/src/generated/resources/data/forge/tags/item/materials/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/materials/gold.json rename to src/generated/resources/data/forge/tags/item/materials/gold.json diff --git a/src/generated/resources/data/forge/tags/items/materials/iron.json b/src/generated/resources/data/forge/tags/item/materials/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/materials/iron.json rename to src/generated/resources/data/forge/tags/item/materials/iron.json diff --git a/src/generated/resources/data/forge/tags/items/materials/obsidian.json b/src/generated/resources/data/forge/tags/item/materials/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/materials/obsidian.json rename to src/generated/resources/data/forge/tags/item/materials/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/materials/quartz.json b/src/generated/resources/data/forge/tags/item/materials/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/materials/quartz.json rename to src/generated/resources/data/forge/tags/item/materials/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/item/nuggets.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets.json rename to src/generated/resources/data/forge/tags/item/nuggets.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/adamant.json b/src/generated/resources/data/forge/tags/item/nuggets/adamant.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/adamant.json rename to src/generated/resources/data/forge/tags/item/nuggets/adamant.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/adamantine.json b/src/generated/resources/data/forge/tags/item/nuggets/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/adamantine.json rename to src/generated/resources/data/forge/tags/item/nuggets/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/adamantite.json b/src/generated/resources/data/forge/tags/item/nuggets/adamantite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/adamantite.json rename to src/generated/resources/data/forge/tags/item/nuggets/adamantite.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/adamantium.json b/src/generated/resources/data/forge/tags/item/nuggets/adamantium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/adamantium.json rename to src/generated/resources/data/forge/tags/item/nuggets/adamantium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/antimony.json b/src/generated/resources/data/forge/tags/item/nuggets/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/antimony.json rename to src/generated/resources/data/forge/tags/item/nuggets/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/aquarium.json b/src/generated/resources/data/forge/tags/item/nuggets/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/aquarium.json rename to src/generated/resources/data/forge/tags/item/nuggets/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/bismuth.json b/src/generated/resources/data/forge/tags/item/nuggets/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/bismuth.json rename to src/generated/resources/data/forge/tags/item/nuggets/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/brass.json b/src/generated/resources/data/forge/tags/item/nuggets/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/brass.json rename to src/generated/resources/data/forge/tags/item/nuggets/brass.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/bronze.json b/src/generated/resources/data/forge/tags/item/nuggets/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/bronze.json rename to src/generated/resources/data/forge/tags/item/nuggets/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/charcoal.json b/src/generated/resources/data/forge/tags/item/nuggets/charcoal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/charcoal.json rename to src/generated/resources/data/forge/tags/item/nuggets/charcoal.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/coal.json b/src/generated/resources/data/forge/tags/item/nuggets/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/coal.json rename to src/generated/resources/data/forge/tags/item/nuggets/coal.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/coldiron.json b/src/generated/resources/data/forge/tags/item/nuggets/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/coldiron.json rename to src/generated/resources/data/forge/tags/item/nuggets/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/copper.json b/src/generated/resources/data/forge/tags/item/nuggets/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/copper.json rename to src/generated/resources/data/forge/tags/item/nuggets/copper.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/cupronickel.json b/src/generated/resources/data/forge/tags/item/nuggets/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/cupronickel.json rename to src/generated/resources/data/forge/tags/item/nuggets/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/diamond.json b/src/generated/resources/data/forge/tags/item/nuggets/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/diamond.json rename to src/generated/resources/data/forge/tags/item/nuggets/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/electrum.json b/src/generated/resources/data/forge/tags/item/nuggets/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/electrum.json rename to src/generated/resources/data/forge/tags/item/nuggets/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/emerald.json b/src/generated/resources/data/forge/tags/item/nuggets/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/emerald.json rename to src/generated/resources/data/forge/tags/item/nuggets/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/invar.json b/src/generated/resources/data/forge/tags/item/nuggets/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/invar.json rename to src/generated/resources/data/forge/tags/item/nuggets/invar.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/lead.json b/src/generated/resources/data/forge/tags/item/nuggets/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/lead.json rename to src/generated/resources/data/forge/tags/item/nuggets/lead.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/mercury.json b/src/generated/resources/data/forge/tags/item/nuggets/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/mercury.json rename to src/generated/resources/data/forge/tags/item/nuggets/mercury.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/mithril.json b/src/generated/resources/data/forge/tags/item/nuggets/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/mithril.json rename to src/generated/resources/data/forge/tags/item/nuggets/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/nickel.json b/src/generated/resources/data/forge/tags/item/nuggets/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/nickel.json rename to src/generated/resources/data/forge/tags/item/nuggets/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/obsidian.json b/src/generated/resources/data/forge/tags/item/nuggets/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/obsidian.json rename to src/generated/resources/data/forge/tags/item/nuggets/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/pewter.json b/src/generated/resources/data/forge/tags/item/nuggets/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/pewter.json rename to src/generated/resources/data/forge/tags/item/nuggets/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/platinum.json b/src/generated/resources/data/forge/tags/item/nuggets/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/platinum.json rename to src/generated/resources/data/forge/tags/item/nuggets/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/quartz.json b/src/generated/resources/data/forge/tags/item/nuggets/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/quartz.json rename to src/generated/resources/data/forge/tags/item/nuggets/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/silver.json b/src/generated/resources/data/forge/tags/item/nuggets/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/silver.json rename to src/generated/resources/data/forge/tags/item/nuggets/silver.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/starsteel.json b/src/generated/resources/data/forge/tags/item/nuggets/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/starsteel.json rename to src/generated/resources/data/forge/tags/item/nuggets/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/steel.json b/src/generated/resources/data/forge/tags/item/nuggets/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/steel.json rename to src/generated/resources/data/forge/tags/item/nuggets/steel.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/tin.json b/src/generated/resources/data/forge/tags/item/nuggets/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/tin.json rename to src/generated/resources/data/forge/tags/item/nuggets/tin.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/zinc.json b/src/generated/resources/data/forge/tags/item/nuggets/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/zinc.json rename to src/generated/resources/data/forge/tags/item/nuggets/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/item/ores.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores.json rename to src/generated/resources/data/forge/tags/item/ores.json diff --git a/src/generated/resources/data/forge/tags/items/ores/adamantine.json b/src/generated/resources/data/forge/tags/item/ores/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/adamantine.json rename to src/generated/resources/data/forge/tags/item/ores/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/ores/antimony.json b/src/generated/resources/data/forge/tags/item/ores/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/antimony.json rename to src/generated/resources/data/forge/tags/item/ores/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/ores/bismuth.json b/src/generated/resources/data/forge/tags/item/ores/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/bismuth.json rename to src/generated/resources/data/forge/tags/item/ores/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/ores/coldiron.json b/src/generated/resources/data/forge/tags/item/ores/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/coldiron.json rename to src/generated/resources/data/forge/tags/item/ores/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/ores/copper.json b/src/generated/resources/data/forge/tags/item/ores/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/copper.json rename to src/generated/resources/data/forge/tags/item/ores/copper.json diff --git a/src/generated/resources/data/forge/tags/items/ores/lead.json b/src/generated/resources/data/forge/tags/item/ores/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/lead.json rename to src/generated/resources/data/forge/tags/item/ores/lead.json diff --git a/src/generated/resources/data/forge/tags/items/ores/mercury.json b/src/generated/resources/data/forge/tags/item/ores/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/mercury.json rename to src/generated/resources/data/forge/tags/item/ores/mercury.json diff --git a/src/generated/resources/data/forge/tags/items/ores/nickel.json b/src/generated/resources/data/forge/tags/item/ores/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/nickel.json rename to src/generated/resources/data/forge/tags/item/ores/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/ores/platinum.json b/src/generated/resources/data/forge/tags/item/ores/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/platinum.json rename to src/generated/resources/data/forge/tags/item/ores/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/ores/silver.json b/src/generated/resources/data/forge/tags/item/ores/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/silver.json rename to src/generated/resources/data/forge/tags/item/ores/silver.json diff --git a/src/generated/resources/data/forge/tags/items/ores/starsteel.json b/src/generated/resources/data/forge/tags/item/ores/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/starsteel.json rename to src/generated/resources/data/forge/tags/item/ores/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/ores/tin.json b/src/generated/resources/data/forge/tags/item/ores/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/tin.json rename to src/generated/resources/data/forge/tags/item/ores/tin.json diff --git a/src/generated/resources/data/forge/tags/items/ores/zinc.json b/src/generated/resources/data/forge/tags/item/ores/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/zinc.json rename to src/generated/resources/data/forge/tags/item/ores/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/plates.json b/src/generated/resources/data/forge/tags/item/plates.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates.json rename to src/generated/resources/data/forge/tags/item/plates.json diff --git a/src/generated/resources/data/forge/tags/items/plates/adamantine.json b/src/generated/resources/data/forge/tags/item/plates/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/adamantine.json rename to src/generated/resources/data/forge/tags/item/plates/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/plates/antimony.json b/src/generated/resources/data/forge/tags/item/plates/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/antimony.json rename to src/generated/resources/data/forge/tags/item/plates/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/plates/aquarium.json b/src/generated/resources/data/forge/tags/item/plates/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/aquarium.json rename to src/generated/resources/data/forge/tags/item/plates/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/bismuth.json b/src/generated/resources/data/forge/tags/item/plates/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/bismuth.json rename to src/generated/resources/data/forge/tags/item/plates/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/plates/brass.json b/src/generated/resources/data/forge/tags/item/plates/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/brass.json rename to src/generated/resources/data/forge/tags/item/plates/brass.json diff --git a/src/generated/resources/data/forge/tags/items/plates/bronze.json b/src/generated/resources/data/forge/tags/item/plates/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/bronze.json rename to src/generated/resources/data/forge/tags/item/plates/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/plates/coldiron.json b/src/generated/resources/data/forge/tags/item/plates/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/coldiron.json rename to src/generated/resources/data/forge/tags/item/plates/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/plates/copper.json b/src/generated/resources/data/forge/tags/item/plates/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/copper.json rename to src/generated/resources/data/forge/tags/item/plates/copper.json diff --git a/src/generated/resources/data/forge/tags/items/plates/cupronickel.json b/src/generated/resources/data/forge/tags/item/plates/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/cupronickel.json rename to src/generated/resources/data/forge/tags/item/plates/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/plates/diamond.json b/src/generated/resources/data/forge/tags/item/plates/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/diamond.json rename to src/generated/resources/data/forge/tags/item/plates/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/plates/electrum.json b/src/generated/resources/data/forge/tags/item/plates/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/electrum.json rename to src/generated/resources/data/forge/tags/item/plates/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/emerald.json b/src/generated/resources/data/forge/tags/item/plates/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/emerald.json rename to src/generated/resources/data/forge/tags/item/plates/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/plates/gold.json b/src/generated/resources/data/forge/tags/item/plates/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/gold.json rename to src/generated/resources/data/forge/tags/item/plates/gold.json diff --git a/src/generated/resources/data/forge/tags/items/plates/invar.json b/src/generated/resources/data/forge/tags/item/plates/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/invar.json rename to src/generated/resources/data/forge/tags/item/plates/invar.json diff --git a/src/generated/resources/data/forge/tags/items/plates/iron.json b/src/generated/resources/data/forge/tags/item/plates/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/iron.json rename to src/generated/resources/data/forge/tags/item/plates/iron.json diff --git a/src/generated/resources/data/forge/tags/items/plates/lead.json b/src/generated/resources/data/forge/tags/item/plates/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/lead.json rename to src/generated/resources/data/forge/tags/item/plates/lead.json diff --git a/src/generated/resources/data/forge/tags/items/plates/mithril.json b/src/generated/resources/data/forge/tags/item/plates/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/mithril.json rename to src/generated/resources/data/forge/tags/item/plates/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/plates/nickel.json b/src/generated/resources/data/forge/tags/item/plates/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/nickel.json rename to src/generated/resources/data/forge/tags/item/plates/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/plates/pewter.json b/src/generated/resources/data/forge/tags/item/plates/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/pewter.json rename to src/generated/resources/data/forge/tags/item/plates/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/plates/platinum.json b/src/generated/resources/data/forge/tags/item/plates/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/platinum.json rename to src/generated/resources/data/forge/tags/item/plates/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/silver.json b/src/generated/resources/data/forge/tags/item/plates/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/silver.json rename to src/generated/resources/data/forge/tags/item/plates/silver.json diff --git a/src/generated/resources/data/forge/tags/items/plates/starsteel.json b/src/generated/resources/data/forge/tags/item/plates/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/starsteel.json rename to src/generated/resources/data/forge/tags/item/plates/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/plates/steel.json b/src/generated/resources/data/forge/tags/item/plates/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/steel.json rename to src/generated/resources/data/forge/tags/item/plates/steel.json diff --git a/src/generated/resources/data/forge/tags/items/plates/tin.json b/src/generated/resources/data/forge/tags/item/plates/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/tin.json rename to src/generated/resources/data/forge/tags/item/plates/tin.json diff --git a/src/generated/resources/data/forge/tags/items/plates/zinc.json b/src/generated/resources/data/forge/tags/item/plates/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/zinc.json rename to src/generated/resources/data/forge/tags/item/plates/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/adamantine.json b/src/generated/resources/data/forge/tags/item/purified_ores/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/adamantine.json rename to src/generated/resources/data/forge/tags/item/purified_ores/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/antimony.json b/src/generated/resources/data/forge/tags/item/purified_ores/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/antimony.json rename to src/generated/resources/data/forge/tags/item/purified_ores/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/bismuth.json b/src/generated/resources/data/forge/tags/item/purified_ores/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/bismuth.json rename to src/generated/resources/data/forge/tags/item/purified_ores/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/coldiron.json b/src/generated/resources/data/forge/tags/item/purified_ores/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/coldiron.json rename to src/generated/resources/data/forge/tags/item/purified_ores/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/nickel.json b/src/generated/resources/data/forge/tags/item/purified_ores/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/nickel.json rename to src/generated/resources/data/forge/tags/item/purified_ores/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/platinum.json b/src/generated/resources/data/forge/tags/item/purified_ores/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/platinum.json rename to src/generated/resources/data/forge/tags/item/purified_ores/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/starsteel.json b/src/generated/resources/data/forge/tags/item/purified_ores/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/starsteel.json rename to src/generated/resources/data/forge/tags/item/purified_ores/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/purified_ores/zinc.json b/src/generated/resources/data/forge/tags/item/purified_ores/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/purified_ores/zinc.json rename to src/generated/resources/data/forge/tags/item/purified_ores/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/item/raw_materials.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials.json rename to src/generated/resources/data/forge/tags/item/raw_materials.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/adamantine.json b/src/generated/resources/data/forge/tags/item/raw_materials/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/adamantine.json rename to src/generated/resources/data/forge/tags/item/raw_materials/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/antimony.json b/src/generated/resources/data/forge/tags/item/raw_materials/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/antimony.json rename to src/generated/resources/data/forge/tags/item/raw_materials/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/bismuth.json b/src/generated/resources/data/forge/tags/item/raw_materials/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/bismuth.json rename to src/generated/resources/data/forge/tags/item/raw_materials/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/coldiron.json b/src/generated/resources/data/forge/tags/item/raw_materials/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/coldiron.json rename to src/generated/resources/data/forge/tags/item/raw_materials/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/copper.json b/src/generated/resources/data/forge/tags/item/raw_materials/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/copper.json rename to src/generated/resources/data/forge/tags/item/raw_materials/copper.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/gold.json b/src/generated/resources/data/forge/tags/item/raw_materials/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/gold.json rename to src/generated/resources/data/forge/tags/item/raw_materials/gold.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/iron.json b/src/generated/resources/data/forge/tags/item/raw_materials/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/iron.json rename to src/generated/resources/data/forge/tags/item/raw_materials/iron.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/lead.json b/src/generated/resources/data/forge/tags/item/raw_materials/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/lead.json rename to src/generated/resources/data/forge/tags/item/raw_materials/lead.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/mercury.json b/src/generated/resources/data/forge/tags/item/raw_materials/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/mercury.json rename to src/generated/resources/data/forge/tags/item/raw_materials/mercury.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/nickel.json b/src/generated/resources/data/forge/tags/item/raw_materials/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/nickel.json rename to src/generated/resources/data/forge/tags/item/raw_materials/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/platinum.json b/src/generated/resources/data/forge/tags/item/raw_materials/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/platinum.json rename to src/generated/resources/data/forge/tags/item/raw_materials/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/silver.json b/src/generated/resources/data/forge/tags/item/raw_materials/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/silver.json rename to src/generated/resources/data/forge/tags/item/raw_materials/silver.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/starsteel.json b/src/generated/resources/data/forge/tags/item/raw_materials/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/starsteel.json rename to src/generated/resources/data/forge/tags/item/raw_materials/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/tin.json b/src/generated/resources/data/forge/tags/item/raw_materials/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/tin.json rename to src/generated/resources/data/forge/tags/item/raw_materials/tin.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/zinc.json b/src/generated/resources/data/forge/tags/item/raw_materials/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/zinc.json rename to src/generated/resources/data/forge/tags/item/raw_materials/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/rods.json b/src/generated/resources/data/forge/tags/item/rods.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods.json rename to src/generated/resources/data/forge/tags/item/rods.json diff --git a/src/generated/resources/data/forge/tags/items/rods/adamantine.json b/src/generated/resources/data/forge/tags/item/rods/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/adamantine.json rename to src/generated/resources/data/forge/tags/item/rods/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/rods/antimony.json b/src/generated/resources/data/forge/tags/item/rods/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/antimony.json rename to src/generated/resources/data/forge/tags/item/rods/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/rods/aquarium.json b/src/generated/resources/data/forge/tags/item/rods/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/aquarium.json rename to src/generated/resources/data/forge/tags/item/rods/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/rods/bismuth.json b/src/generated/resources/data/forge/tags/item/rods/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/bismuth.json rename to src/generated/resources/data/forge/tags/item/rods/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/rods/brass.json b/src/generated/resources/data/forge/tags/item/rods/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/brass.json rename to src/generated/resources/data/forge/tags/item/rods/brass.json diff --git a/src/generated/resources/data/forge/tags/items/rods/bronze.json b/src/generated/resources/data/forge/tags/item/rods/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/bronze.json rename to src/generated/resources/data/forge/tags/item/rods/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/rods/coldiron.json b/src/generated/resources/data/forge/tags/item/rods/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/coldiron.json rename to src/generated/resources/data/forge/tags/item/rods/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/rods/copper.json b/src/generated/resources/data/forge/tags/item/rods/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/copper.json rename to src/generated/resources/data/forge/tags/item/rods/copper.json diff --git a/src/generated/resources/data/forge/tags/items/rods/cupronickel.json b/src/generated/resources/data/forge/tags/item/rods/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/cupronickel.json rename to src/generated/resources/data/forge/tags/item/rods/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/rods/diamond.json b/src/generated/resources/data/forge/tags/item/rods/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/diamond.json rename to src/generated/resources/data/forge/tags/item/rods/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/rods/electrum.json b/src/generated/resources/data/forge/tags/item/rods/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/electrum.json rename to src/generated/resources/data/forge/tags/item/rods/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/rods/emerald.json b/src/generated/resources/data/forge/tags/item/rods/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/emerald.json rename to src/generated/resources/data/forge/tags/item/rods/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/rods/gold.json b/src/generated/resources/data/forge/tags/item/rods/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/gold.json rename to src/generated/resources/data/forge/tags/item/rods/gold.json diff --git a/src/generated/resources/data/forge/tags/items/rods/invar.json b/src/generated/resources/data/forge/tags/item/rods/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/invar.json rename to src/generated/resources/data/forge/tags/item/rods/invar.json diff --git a/src/generated/resources/data/forge/tags/items/rods/iron.json b/src/generated/resources/data/forge/tags/item/rods/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/iron.json rename to src/generated/resources/data/forge/tags/item/rods/iron.json diff --git a/src/generated/resources/data/forge/tags/items/rods/lead.json b/src/generated/resources/data/forge/tags/item/rods/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/lead.json rename to src/generated/resources/data/forge/tags/item/rods/lead.json diff --git a/src/generated/resources/data/forge/tags/items/rods/mithril.json b/src/generated/resources/data/forge/tags/item/rods/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/mithril.json rename to src/generated/resources/data/forge/tags/item/rods/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/rods/nickel.json b/src/generated/resources/data/forge/tags/item/rods/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/nickel.json rename to src/generated/resources/data/forge/tags/item/rods/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/rods/obsidian.json b/src/generated/resources/data/forge/tags/item/rods/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/obsidian.json rename to src/generated/resources/data/forge/tags/item/rods/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/rods/pewter.json b/src/generated/resources/data/forge/tags/item/rods/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/pewter.json rename to src/generated/resources/data/forge/tags/item/rods/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/rods/platinum.json b/src/generated/resources/data/forge/tags/item/rods/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/platinum.json rename to src/generated/resources/data/forge/tags/item/rods/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/rods/quartz.json b/src/generated/resources/data/forge/tags/item/rods/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/quartz.json rename to src/generated/resources/data/forge/tags/item/rods/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/rods/silver.json b/src/generated/resources/data/forge/tags/item/rods/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/silver.json rename to src/generated/resources/data/forge/tags/item/rods/silver.json diff --git a/src/generated/resources/data/forge/tags/items/rods/starsteel.json b/src/generated/resources/data/forge/tags/item/rods/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/starsteel.json rename to src/generated/resources/data/forge/tags/item/rods/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/rods/steel.json b/src/generated/resources/data/forge/tags/item/rods/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/steel.json rename to src/generated/resources/data/forge/tags/item/rods/steel.json diff --git a/src/generated/resources/data/forge/tags/items/rods/stone.json b/src/generated/resources/data/forge/tags/item/rods/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/stone.json rename to src/generated/resources/data/forge/tags/item/rods/stone.json diff --git a/src/generated/resources/data/forge/tags/items/rods/tin.json b/src/generated/resources/data/forge/tags/item/rods/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/tin.json rename to src/generated/resources/data/forge/tags/item/rods/tin.json diff --git a/src/generated/resources/data/forge/tags/items/rods/zinc.json b/src/generated/resources/data/forge/tags/item/rods/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/zinc.json rename to src/generated/resources/data/forge/tags/item/rods/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/shards/adamantine.json b/src/generated/resources/data/forge/tags/item/shards/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/adamantine.json rename to src/generated/resources/data/forge/tags/item/shards/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/shards/antimony.json b/src/generated/resources/data/forge/tags/item/shards/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/antimony.json rename to src/generated/resources/data/forge/tags/item/shards/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/shards/bismuth.json b/src/generated/resources/data/forge/tags/item/shards/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/bismuth.json rename to src/generated/resources/data/forge/tags/item/shards/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/shards/coldiron.json b/src/generated/resources/data/forge/tags/item/shards/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/coldiron.json rename to src/generated/resources/data/forge/tags/item/shards/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/shards/nickel.json b/src/generated/resources/data/forge/tags/item/shards/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/nickel.json rename to src/generated/resources/data/forge/tags/item/shards/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/shards/platinum.json b/src/generated/resources/data/forge/tags/item/shards/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/platinum.json rename to src/generated/resources/data/forge/tags/item/shards/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/shards/starsteel.json b/src/generated/resources/data/forge/tags/item/shards/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/starsteel.json rename to src/generated/resources/data/forge/tags/item/shards/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/shards/zinc.json b/src/generated/resources/data/forge/tags/item/shards/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shards/zinc.json rename to src/generated/resources/data/forge/tags/item/shards/zinc.json diff --git a/src/generated/resources/data/forge/tags/item/slabs/copper.json b/src/generated/resources/data/forge/tags/item/slabs/copper.json new file mode 100644 index 000000000..6695810f9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/slabs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_slab", + "minecraft:cut_copper_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/small_blends/aquarium.json b/src/generated/resources/data/forge/tags/item/small_blends/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/aquarium.json rename to src/generated/resources/data/forge/tags/item/small_blends/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/brass.json b/src/generated/resources/data/forge/tags/item/small_blends/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/brass.json rename to src/generated/resources/data/forge/tags/item/small_blends/brass.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/bronze.json b/src/generated/resources/data/forge/tags/item/small_blends/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/bronze.json rename to src/generated/resources/data/forge/tags/item/small_blends/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/cupronickel.json b/src/generated/resources/data/forge/tags/item/small_blends/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/cupronickel.json rename to src/generated/resources/data/forge/tags/item/small_blends/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/diamond.json b/src/generated/resources/data/forge/tags/item/small_blends/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/diamond.json rename to src/generated/resources/data/forge/tags/item/small_blends/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/electrum.json b/src/generated/resources/data/forge/tags/item/small_blends/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/electrum.json rename to src/generated/resources/data/forge/tags/item/small_blends/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/gold.json b/src/generated/resources/data/forge/tags/item/small_blends/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/gold.json rename to src/generated/resources/data/forge/tags/item/small_blends/gold.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/invar.json b/src/generated/resources/data/forge/tags/item/small_blends/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/invar.json rename to src/generated/resources/data/forge/tags/item/small_blends/invar.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/iron.json b/src/generated/resources/data/forge/tags/item/small_blends/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/iron.json rename to src/generated/resources/data/forge/tags/item/small_blends/iron.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/mithril.json b/src/generated/resources/data/forge/tags/item/small_blends/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/mithril.json rename to src/generated/resources/data/forge/tags/item/small_blends/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/pewter.json b/src/generated/resources/data/forge/tags/item/small_blends/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/pewter.json rename to src/generated/resources/data/forge/tags/item/small_blends/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/small_blends/steel.json b/src/generated/resources/data/forge/tags/item/small_blends/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/small_blends/steel.json rename to src/generated/resources/data/forge/tags/item/small_blends/steel.json diff --git a/src/generated/resources/data/forge/tags/items/sprockets/steel.json b/src/generated/resources/data/forge/tags/item/sprockets/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/sprockets/steel.json rename to src/generated/resources/data/forge/tags/item/sprockets/steel.json diff --git a/src/generated/resources/data/forge/tags/item/stairs/copper.json b/src/generated/resources/data/forge/tags/item/stairs/copper.json new file mode 100644 index 000000000..96357a57a --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/stairs/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_stairs", + "minecraft:cut_copper_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/item/storage_blocks.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks.json rename to src/generated/resources/data/forge/tags/item/storage_blocks.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/adamantine.json b/src/generated/resources/data/forge/tags/item/storage_blocks/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/adamantine.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/antimony.json b/src/generated/resources/data/forge/tags/item/storage_blocks/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/antimony.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/aquarium.json b/src/generated/resources/data/forge/tags/item/storage_blocks/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/aquarium.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/bismuth.json b/src/generated/resources/data/forge/tags/item/storage_blocks/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/bismuth.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/brass.json b/src/generated/resources/data/forge/tags/item/storage_blocks/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/brass.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/brass.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/bronze.json b/src/generated/resources/data/forge/tags/item/storage_blocks/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/bronze.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/charcoal.json b/src/generated/resources/data/forge/tags/item/storage_blocks/charcoal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/charcoal.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/charcoal.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/coldiron.json b/src/generated/resources/data/forge/tags/item/storage_blocks/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/coldiron.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/item/storage_blocks/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/copper.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/copper.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cupronickel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/cupronickel.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/diamond.json b/src/generated/resources/data/forge/tags/item/storage_blocks/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/diamond.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/electrum.json b/src/generated/resources/data/forge/tags/item/storage_blocks/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/electrum.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/emerald.json b/src/generated/resources/data/forge/tags/item/storage_blocks/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/emerald.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/gold.json b/src/generated/resources/data/forge/tags/item/storage_blocks/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/gold.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/gold.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/invar.json b/src/generated/resources/data/forge/tags/item/storage_blocks/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/invar.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/invar.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/iron.json b/src/generated/resources/data/forge/tags/item/storage_blocks/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/iron.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/iron.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json b/src/generated/resources/data/forge/tags/item/storage_blocks/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/lead.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/lead.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/mithril.json b/src/generated/resources/data/forge/tags/item/storage_blocks/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/mithril.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/nickel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/nickel.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/obsidian.json b/src/generated/resources/data/forge/tags/item/storage_blocks/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/obsidian.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/pewter.json b/src/generated/resources/data/forge/tags/item/storage_blocks/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/pewter.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/platinum.json b/src/generated/resources/data/forge/tags/item/storage_blocks/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/platinum.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/quartz.json b/src/generated/resources/data/forge/tags/item/storage_blocks/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/quartz.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/item/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/silver.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/silver.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/starsteel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/starsteel.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/item/storage_blocks/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/steel.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/steel.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tin.json b/src/generated/resources/data/forge/tags/item/storage_blocks/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/tin.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/tin.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json b/src/generated/resources/data/forge/tags/item/storage_blocks/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json rename to src/generated/resources/data/forge/tags/item/storage_blocks/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts.json b/src/generated/resources/data/forge/tags/item/tiny_dusts.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/adamantine.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/adamantine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/adamantine.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/adamantine.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/antimony.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/antimony.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/aquarium.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/aquarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/aquarium.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/aquarium.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/bismuth.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/bismuth.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/brass.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/brass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/brass.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/brass.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/bronze.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/bronze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/bronze.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/bronze.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/charcoal.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/charcoal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/charcoal.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/charcoal.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/coal.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/coal.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/coal.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/coldiron.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/coldiron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/coldiron.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/coldiron.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/copper.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/copper.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/copper.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/cupronickel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/cupronickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/cupronickel.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/cupronickel.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/diamond.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/diamond.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/electrum.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/electrum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/electrum.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/electrum.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/emerald.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/emerald.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/gold.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/gold.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/gold.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/invar.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/invar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/invar.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/invar.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/iron.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/iron.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/iron.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/lapis.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/lapis.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/lapis.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/lead.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/lead.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/lead.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/mercury.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/mercury.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/mercury.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/mercury.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/mithril.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/mithril.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/mithril.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/mithril.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/nickel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/nickel.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/obsidian.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/obsidian.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/pewter.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/pewter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/pewter.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/pewter.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/platinum.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/platinum.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/quartz.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/quartz.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/redstone.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/redstone.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/redstone.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/silver.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/silver.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/silver.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/starsteel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/starsteel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/starsteel.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/starsteel.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/steel.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/steel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/steel.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/steel.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/tin.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/tin.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/tin.json diff --git a/src/generated/resources/data/forge/tags/items/tiny_dusts/zinc.json b/src/generated/resources/data/forge/tags/item/tiny_dusts/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tiny_dusts/zinc.json rename to src/generated/resources/data/forge/tags/item/tiny_dusts/zinc.json diff --git a/src/generated/resources/data/forge/tags/item/trapdoors/copper.json b/src/generated/resources/data/forge/tags/item/trapdoors/copper.json new file mode 100644 index 000000000..0bb1f00b1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/trapdoors/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_trapdoor", + "minecraft:copper_trapdoor" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/adamantine.json b/src/generated/resources/data/mekanism/tags/item/clumps/adamantine.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/adamantine.json rename to src/generated/resources/data/mekanism/tags/item/clumps/adamantine.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/antimony.json b/src/generated/resources/data/mekanism/tags/item/clumps/antimony.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/antimony.json rename to src/generated/resources/data/mekanism/tags/item/clumps/antimony.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/bismuth.json b/src/generated/resources/data/mekanism/tags/item/clumps/bismuth.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/bismuth.json rename to src/generated/resources/data/mekanism/tags/item/clumps/bismuth.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/coldiron.json b/src/generated/resources/data/mekanism/tags/item/clumps/coldiron.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/coldiron.json rename to src/generated/resources/data/mekanism/tags/item/clumps/coldiron.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/nickel.json b/src/generated/resources/data/mekanism/tags/item/clumps/nickel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/nickel.json rename to src/generated/resources/data/mekanism/tags/item/clumps/nickel.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/platinum.json b/src/generated/resources/data/mekanism/tags/item/clumps/platinum.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/platinum.json rename to src/generated/resources/data/mekanism/tags/item/clumps/platinum.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/starsteel.json b/src/generated/resources/data/mekanism/tags/item/clumps/starsteel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/starsteel.json rename to src/generated/resources/data/mekanism/tags/item/clumps/starsteel.json diff --git a/src/generated/resources/data/mekanism/tags/items/clumps/zinc.json b/src/generated/resources/data/mekanism/tags/item/clumps/zinc.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/clumps/zinc.json rename to src/generated/resources/data/mekanism/tags/item/clumps/zinc.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/adamantine.json b/src/generated/resources/data/mekanism/tags/item/crystals/adamantine.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/adamantine.json rename to src/generated/resources/data/mekanism/tags/item/crystals/adamantine.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/antimony.json b/src/generated/resources/data/mekanism/tags/item/crystals/antimony.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/antimony.json rename to src/generated/resources/data/mekanism/tags/item/crystals/antimony.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/bismuth.json b/src/generated/resources/data/mekanism/tags/item/crystals/bismuth.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/bismuth.json rename to src/generated/resources/data/mekanism/tags/item/crystals/bismuth.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/coldiron.json b/src/generated/resources/data/mekanism/tags/item/crystals/coldiron.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/coldiron.json rename to src/generated/resources/data/mekanism/tags/item/crystals/coldiron.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/nickel.json b/src/generated/resources/data/mekanism/tags/item/crystals/nickel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/nickel.json rename to src/generated/resources/data/mekanism/tags/item/crystals/nickel.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/platinum.json b/src/generated/resources/data/mekanism/tags/item/crystals/platinum.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/platinum.json rename to src/generated/resources/data/mekanism/tags/item/crystals/platinum.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/starsteel.json b/src/generated/resources/data/mekanism/tags/item/crystals/starsteel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/starsteel.json rename to src/generated/resources/data/mekanism/tags/item/crystals/starsteel.json diff --git a/src/generated/resources/data/mekanism/tags/items/crystals/zinc.json b/src/generated/resources/data/mekanism/tags/item/crystals/zinc.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/crystals/zinc.json rename to src/generated/resources/data/mekanism/tags/item/crystals/zinc.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/adamantine.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/adamantine.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/adamantine.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/adamantine.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/antimony.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/antimony.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/antimony.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/antimony.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/bismuth.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/bismuth.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/bismuth.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/bismuth.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/coldiron.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/coldiron.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/coldiron.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/coldiron.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/nickel.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/nickel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/nickel.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/nickel.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/platinum.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/platinum.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/platinum.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/platinum.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/starsteel.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/starsteel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/starsteel.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/starsteel.json diff --git a/src/generated/resources/data/mekanism/tags/items/dirty_dusts/zinc.json b/src/generated/resources/data/mekanism/tags/item/dirty_dusts/zinc.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/dirty_dusts/zinc.json rename to src/generated/resources/data/mekanism/tags/item/dirty_dusts/zinc.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/adamantine.json b/src/generated/resources/data/mekanism/tags/item/shards/adamantine.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/adamantine.json rename to src/generated/resources/data/mekanism/tags/item/shards/adamantine.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/antimony.json b/src/generated/resources/data/mekanism/tags/item/shards/antimony.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/antimony.json rename to src/generated/resources/data/mekanism/tags/item/shards/antimony.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/bismuth.json b/src/generated/resources/data/mekanism/tags/item/shards/bismuth.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/bismuth.json rename to src/generated/resources/data/mekanism/tags/item/shards/bismuth.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/coldiron.json b/src/generated/resources/data/mekanism/tags/item/shards/coldiron.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/coldiron.json rename to src/generated/resources/data/mekanism/tags/item/shards/coldiron.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/nickel.json b/src/generated/resources/data/mekanism/tags/item/shards/nickel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/nickel.json rename to src/generated/resources/data/mekanism/tags/item/shards/nickel.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/platinum.json b/src/generated/resources/data/mekanism/tags/item/shards/platinum.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/platinum.json rename to src/generated/resources/data/mekanism/tags/item/shards/platinum.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/starsteel.json b/src/generated/resources/data/mekanism/tags/item/shards/starsteel.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/starsteel.json rename to src/generated/resources/data/mekanism/tags/item/shards/starsteel.json diff --git a/src/generated/resources/data/mekanism/tags/items/shards/zinc.json b/src/generated/resources/data/mekanism/tags/item/shards/zinc.json similarity index 100% rename from src/generated/resources/data/mekanism/tags/items/shards/zinc.json rename to src/generated/resources/data/mekanism/tags/item/shards/zinc.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json rename to src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json rename to src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json rename to src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json rename to src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/generated/resources/data/minecraft/tags/entity_type/arrows.json b/src/generated/resources/data/minecraft/tags/entity_type/arrows.json new file mode 100644 index 000000000..da76631f2 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/entity_type/arrows.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:custom_arrow", + "basemetals:custom_bolt" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/arrows.json b/src/generated/resources/data/minecraft/tags/item/arrows.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/arrows.json rename to src/generated/resources/data/minecraft/tags/item/arrows.json diff --git a/src/generated/resources/data/minecraft/tags/item/axes.json b/src/generated/resources/data/minecraft/tags/item/axes.json new file mode 100644 index 000000000..e41b3dad2 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/axes.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_axe", + "basemetals:antimony_axe", + "basemetals:aquarium_axe", + "basemetals:bismuth_axe", + "basemetals:brass_axe", + "basemetals:bronze_axe", + "basemetals:coldiron_axe", + "basemetals:copper_axe", + "basemetals:cupronickel_axe", + "basemetals:electrum_axe", + "basemetals:emerald_axe", + "basemetals:invar_axe", + "basemetals:lead_axe", + "basemetals:mithril_axe", + "basemetals:nickel_axe", + "basemetals:obsidian_axe", + "basemetals:pewter_axe", + "basemetals:platinum_axe", + "basemetals:quartz_axe", + "basemetals:silver_axe", + "basemetals:starsteel_axe", + "basemetals:steel_axe", + "basemetals:tin_axe", + "basemetals:zinc_axe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/chest_armor.json b/src/generated/resources/data/minecraft/tags/item/chest_armor.json new file mode 100644 index 000000000..c373230ac --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/chest_armor.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_chestplate", + "basemetals:antimony_chestplate", + "basemetals:aquarium_chestplate", + "basemetals:bismuth_chestplate", + "basemetals:brass_chestplate", + "basemetals:bronze_chestplate", + "basemetals:coldiron_chestplate", + "basemetals:copper_chestplate", + "basemetals:cupronickel_chestplate", + "basemetals:electrum_chestplate", + "basemetals:emerald_chestplate", + "basemetals:invar_chestplate", + "basemetals:lead_chestplate", + "basemetals:mithril_chestplate", + "basemetals:nickel_chestplate", + "basemetals:obsidian_chestplate", + "basemetals:pewter_chestplate", + "basemetals:platinum_chestplate", + "basemetals:quartz_chestplate", + "basemetals:silver_chestplate", + "basemetals:starsteel_chestplate", + "basemetals:steel_chestplate", + "basemetals:tin_chestplate", + "basemetals:zinc_chestplate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/bow.json b/src/generated/resources/data/minecraft/tags/item/enchantable/bow.json new file mode 100644 index 000000000..5f7711879 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/bow.json @@ -0,0 +1,59 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_bow", + "basemetals:adamantine_crossbow", + "basemetals:antimony_bow", + "basemetals:antimony_crossbow", + "basemetals:aquarium_bow", + "basemetals:aquarium_crossbow", + "basemetals:bismuth_bow", + "basemetals:bismuth_crossbow", + "basemetals:brass_bow", + "basemetals:brass_crossbow", + "basemetals:bronze_bow", + "basemetals:bronze_crossbow", + "basemetals:coldiron_bow", + "basemetals:coldiron_crossbow", + "basemetals:copper_bow", + "basemetals:copper_crossbow", + "basemetals:cupronickel_bow", + "basemetals:cupronickel_crossbow", + "basemetals:diamond_bow", + "basemetals:diamond_crossbow", + "basemetals:electrum_bow", + "basemetals:electrum_crossbow", + "basemetals:emerald_bow", + "basemetals:emerald_crossbow", + "basemetals:gold_bow", + "basemetals:gold_crossbow", + "basemetals:invar_bow", + "basemetals:invar_crossbow", + "basemetals:iron_bow", + "basemetals:iron_crossbow", + "basemetals:lead_bow", + "basemetals:lead_crossbow", + "basemetals:mithril_bow", + "basemetals:mithril_crossbow", + "basemetals:nickel_bow", + "basemetals:nickel_crossbow", + "basemetals:obsidian_bow", + "basemetals:obsidian_crossbow", + "basemetals:pewter_bow", + "basemetals:pewter_crossbow", + "basemetals:platinum_bow", + "basemetals:platinum_crossbow", + "basemetals:quartz_bow", + "basemetals:quartz_crossbow", + "basemetals:silver_bow", + "basemetals:silver_crossbow", + "basemetals:starsteel_bow", + "basemetals:starsteel_crossbow", + "basemetals:steel_bow", + "basemetals:steel_crossbow", + "basemetals:tin_bow", + "basemetals:tin_crossbow", + "basemetals:zinc_bow", + "basemetals:zinc_crossbow" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json b/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json new file mode 100644 index 000000000..998c3840c --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json @@ -0,0 +1,413 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_axe", + "basemetals:adamantine_boots", + "basemetals:adamantine_bow", + "basemetals:adamantine_chestplate", + "basemetals:adamantine_crackhammer", + "basemetals:adamantine_crossbow", + "basemetals:adamantine_fishing_rod", + "basemetals:adamantine_helmet", + "basemetals:adamantine_hoe", + "basemetals:adamantine_leggings", + "basemetals:adamantine_pickaxe", + "basemetals:adamantine_scythe", + "basemetals:adamantine_shears", + "basemetals:adamantine_shield", + "basemetals:adamantine_shovel", + "basemetals:adamantine_sword", + "basemetals:antimony_axe", + "basemetals:antimony_boots", + "basemetals:antimony_bow", + "basemetals:antimony_chestplate", + "basemetals:antimony_crackhammer", + "basemetals:antimony_crossbow", + "basemetals:antimony_fishing_rod", + "basemetals:antimony_helmet", + "basemetals:antimony_hoe", + "basemetals:antimony_leggings", + "basemetals:antimony_pickaxe", + "basemetals:antimony_scythe", + "basemetals:antimony_shears", + "basemetals:antimony_shield", + "basemetals:antimony_shovel", + "basemetals:antimony_sword", + "basemetals:aquarium_axe", + "basemetals:aquarium_boots", + "basemetals:aquarium_bow", + "basemetals:aquarium_chestplate", + "basemetals:aquarium_crackhammer", + "basemetals:aquarium_crossbow", + "basemetals:aquarium_fishing_rod", + "basemetals:aquarium_helmet", + "basemetals:aquarium_hoe", + "basemetals:aquarium_leggings", + "basemetals:aquarium_pickaxe", + "basemetals:aquarium_scythe", + "basemetals:aquarium_shears", + "basemetals:aquarium_shield", + "basemetals:aquarium_shovel", + "basemetals:aquarium_sword", + "basemetals:bismuth_axe", + "basemetals:bismuth_boots", + "basemetals:bismuth_bow", + "basemetals:bismuth_chestplate", + "basemetals:bismuth_crackhammer", + "basemetals:bismuth_crossbow", + "basemetals:bismuth_fishing_rod", + "basemetals:bismuth_helmet", + "basemetals:bismuth_hoe", + "basemetals:bismuth_leggings", + "basemetals:bismuth_pickaxe", + "basemetals:bismuth_scythe", + "basemetals:bismuth_shears", + "basemetals:bismuth_shield", + "basemetals:bismuth_shovel", + "basemetals:bismuth_sword", + "basemetals:brass_axe", + "basemetals:brass_boots", + "basemetals:brass_bow", + "basemetals:brass_chestplate", + "basemetals:brass_crackhammer", + "basemetals:brass_crossbow", + "basemetals:brass_fishing_rod", + "basemetals:brass_helmet", + "basemetals:brass_hoe", + "basemetals:brass_leggings", + "basemetals:brass_pickaxe", + "basemetals:brass_scythe", + "basemetals:brass_shears", + "basemetals:brass_shield", + "basemetals:brass_shovel", + "basemetals:brass_sword", + "basemetals:bronze_axe", + "basemetals:bronze_boots", + "basemetals:bronze_bow", + "basemetals:bronze_chestplate", + "basemetals:bronze_crackhammer", + "basemetals:bronze_crossbow", + "basemetals:bronze_fishing_rod", + "basemetals:bronze_helmet", + "basemetals:bronze_hoe", + "basemetals:bronze_leggings", + "basemetals:bronze_pickaxe", + "basemetals:bronze_scythe", + "basemetals:bronze_shears", + "basemetals:bronze_shield", + "basemetals:bronze_shovel", + "basemetals:bronze_sword", + "basemetals:coldiron_axe", + "basemetals:coldiron_boots", + "basemetals:coldiron_bow", + "basemetals:coldiron_chestplate", + "basemetals:coldiron_crackhammer", + "basemetals:coldiron_crossbow", + "basemetals:coldiron_fishing_rod", + "basemetals:coldiron_helmet", + "basemetals:coldiron_hoe", + "basemetals:coldiron_leggings", + "basemetals:coldiron_pickaxe", + "basemetals:coldiron_scythe", + "basemetals:coldiron_shears", + "basemetals:coldiron_shield", + "basemetals:coldiron_shovel", + "basemetals:coldiron_sword", + "basemetals:copper_axe", + "basemetals:copper_boots", + "basemetals:copper_bow", + "basemetals:copper_chestplate", + "basemetals:copper_crackhammer", + "basemetals:copper_crossbow", + "basemetals:copper_fishing_rod", + "basemetals:copper_helmet", + "basemetals:copper_hoe", + "basemetals:copper_leggings", + "basemetals:copper_pickaxe", + "basemetals:copper_scythe", + "basemetals:copper_shears", + "basemetals:copper_shield", + "basemetals:copper_shovel", + "basemetals:copper_sword", + "basemetals:cupronickel_axe", + "basemetals:cupronickel_boots", + "basemetals:cupronickel_bow", + "basemetals:cupronickel_chestplate", + "basemetals:cupronickel_crackhammer", + "basemetals:cupronickel_crossbow", + "basemetals:cupronickel_fishing_rod", + "basemetals:cupronickel_helmet", + "basemetals:cupronickel_hoe", + "basemetals:cupronickel_leggings", + "basemetals:cupronickel_pickaxe", + "basemetals:cupronickel_scythe", + "basemetals:cupronickel_shears", + "basemetals:cupronickel_shield", + "basemetals:cupronickel_shovel", + "basemetals:cupronickel_sword", + "basemetals:diamond_bow", + "basemetals:diamond_crackhammer", + "basemetals:diamond_crossbow", + "basemetals:diamond_fishing_rod", + "basemetals:diamond_scythe", + "basemetals:diamond_shears", + "basemetals:diamond_shield", + "basemetals:electrum_axe", + "basemetals:electrum_boots", + "basemetals:electrum_bow", + "basemetals:electrum_chestplate", + "basemetals:electrum_crackhammer", + "basemetals:electrum_crossbow", + "basemetals:electrum_fishing_rod", + "basemetals:electrum_helmet", + "basemetals:electrum_hoe", + "basemetals:electrum_leggings", + "basemetals:electrum_pickaxe", + "basemetals:electrum_scythe", + "basemetals:electrum_shears", + "basemetals:electrum_shield", + "basemetals:electrum_shovel", + "basemetals:electrum_sword", + "basemetals:emerald_axe", + "basemetals:emerald_boots", + "basemetals:emerald_bow", + "basemetals:emerald_chestplate", + "basemetals:emerald_crackhammer", + "basemetals:emerald_crossbow", + "basemetals:emerald_fishing_rod", + "basemetals:emerald_helmet", + "basemetals:emerald_hoe", + "basemetals:emerald_leggings", + "basemetals:emerald_pickaxe", + "basemetals:emerald_scythe", + "basemetals:emerald_shears", + "basemetals:emerald_shield", + "basemetals:emerald_shovel", + "basemetals:emerald_sword", + "basemetals:gold_bow", + "basemetals:gold_crackhammer", + "basemetals:gold_crossbow", + "basemetals:gold_fishing_rod", + "basemetals:gold_scythe", + "basemetals:gold_shears", + "basemetals:gold_shield", + "basemetals:invar_axe", + "basemetals:invar_boots", + "basemetals:invar_bow", + "basemetals:invar_chestplate", + "basemetals:invar_crackhammer", + "basemetals:invar_crossbow", + "basemetals:invar_fishing_rod", + "basemetals:invar_helmet", + "basemetals:invar_hoe", + "basemetals:invar_leggings", + "basemetals:invar_pickaxe", + "basemetals:invar_scythe", + "basemetals:invar_shears", + "basemetals:invar_shield", + "basemetals:invar_shovel", + "basemetals:invar_sword", + "basemetals:iron_bow", + "basemetals:iron_crackhammer", + "basemetals:iron_crossbow", + "basemetals:iron_fishing_rod", + "basemetals:iron_scythe", + "basemetals:iron_shield", + "basemetals:lead_axe", + "basemetals:lead_boots", + "basemetals:lead_bow", + "basemetals:lead_chestplate", + "basemetals:lead_crackhammer", + "basemetals:lead_crossbow", + "basemetals:lead_fishing_rod", + "basemetals:lead_helmet", + "basemetals:lead_hoe", + "basemetals:lead_leggings", + "basemetals:lead_pickaxe", + "basemetals:lead_scythe", + "basemetals:lead_shears", + "basemetals:lead_shield", + "basemetals:lead_shovel", + "basemetals:lead_sword", + "basemetals:mithril_axe", + "basemetals:mithril_boots", + "basemetals:mithril_bow", + "basemetals:mithril_chestplate", + "basemetals:mithril_crackhammer", + "basemetals:mithril_crossbow", + "basemetals:mithril_fishing_rod", + "basemetals:mithril_helmet", + "basemetals:mithril_hoe", + "basemetals:mithril_leggings", + "basemetals:mithril_pickaxe", + "basemetals:mithril_scythe", + "basemetals:mithril_shears", + "basemetals:mithril_shield", + "basemetals:mithril_shovel", + "basemetals:mithril_sword", + "basemetals:nickel_axe", + "basemetals:nickel_boots", + "basemetals:nickel_bow", + "basemetals:nickel_chestplate", + "basemetals:nickel_crackhammer", + "basemetals:nickel_crossbow", + "basemetals:nickel_fishing_rod", + "basemetals:nickel_helmet", + "basemetals:nickel_hoe", + "basemetals:nickel_leggings", + "basemetals:nickel_pickaxe", + "basemetals:nickel_scythe", + "basemetals:nickel_shears", + "basemetals:nickel_shield", + "basemetals:nickel_shovel", + "basemetals:nickel_sword", + "basemetals:obsidian_axe", + "basemetals:obsidian_boots", + "basemetals:obsidian_bow", + "basemetals:obsidian_chestplate", + "basemetals:obsidian_crackhammer", + "basemetals:obsidian_crossbow", + "basemetals:obsidian_fishing_rod", + "basemetals:obsidian_helmet", + "basemetals:obsidian_hoe", + "basemetals:obsidian_leggings", + "basemetals:obsidian_pickaxe", + "basemetals:obsidian_scythe", + "basemetals:obsidian_shears", + "basemetals:obsidian_shield", + "basemetals:obsidian_shovel", + "basemetals:obsidian_sword", + "basemetals:pewter_axe", + "basemetals:pewter_boots", + "basemetals:pewter_bow", + "basemetals:pewter_chestplate", + "basemetals:pewter_crackhammer", + "basemetals:pewter_crossbow", + "basemetals:pewter_fishing_rod", + "basemetals:pewter_helmet", + "basemetals:pewter_hoe", + "basemetals:pewter_leggings", + "basemetals:pewter_pickaxe", + "basemetals:pewter_scythe", + "basemetals:pewter_shears", + "basemetals:pewter_shield", + "basemetals:pewter_shovel", + "basemetals:pewter_sword", + "basemetals:platinum_axe", + "basemetals:platinum_boots", + "basemetals:platinum_bow", + "basemetals:platinum_chestplate", + "basemetals:platinum_crackhammer", + "basemetals:platinum_crossbow", + "basemetals:platinum_fishing_rod", + "basemetals:platinum_helmet", + "basemetals:platinum_hoe", + "basemetals:platinum_leggings", + "basemetals:platinum_pickaxe", + "basemetals:platinum_scythe", + "basemetals:platinum_shears", + "basemetals:platinum_shield", + "basemetals:platinum_shovel", + "basemetals:platinum_sword", + "basemetals:quartz_axe", + "basemetals:quartz_boots", + "basemetals:quartz_bow", + "basemetals:quartz_chestplate", + "basemetals:quartz_crackhammer", + "basemetals:quartz_crossbow", + "basemetals:quartz_fishing_rod", + "basemetals:quartz_helmet", + "basemetals:quartz_hoe", + "basemetals:quartz_leggings", + "basemetals:quartz_pickaxe", + "basemetals:quartz_scythe", + "basemetals:quartz_shears", + "basemetals:quartz_shield", + "basemetals:quartz_shovel", + "basemetals:quartz_sword", + "basemetals:silver_axe", + "basemetals:silver_boots", + "basemetals:silver_bow", + "basemetals:silver_chestplate", + "basemetals:silver_crackhammer", + "basemetals:silver_crossbow", + "basemetals:silver_fishing_rod", + "basemetals:silver_helmet", + "basemetals:silver_hoe", + "basemetals:silver_leggings", + "basemetals:silver_pickaxe", + "basemetals:silver_scythe", + "basemetals:silver_shears", + "basemetals:silver_shield", + "basemetals:silver_shovel", + "basemetals:silver_sword", + "basemetals:starsteel_axe", + "basemetals:starsteel_boots", + "basemetals:starsteel_bow", + "basemetals:starsteel_chestplate", + "basemetals:starsteel_crackhammer", + "basemetals:starsteel_crossbow", + "basemetals:starsteel_fishing_rod", + "basemetals:starsteel_helmet", + "basemetals:starsteel_hoe", + "basemetals:starsteel_leggings", + "basemetals:starsteel_pickaxe", + "basemetals:starsteel_scythe", + "basemetals:starsteel_shears", + "basemetals:starsteel_shield", + "basemetals:starsteel_shovel", + "basemetals:starsteel_sword", + "basemetals:steel_axe", + "basemetals:steel_boots", + "basemetals:steel_bow", + "basemetals:steel_chestplate", + "basemetals:steel_crackhammer", + "basemetals:steel_crossbow", + "basemetals:steel_fishing_rod", + "basemetals:steel_helmet", + "basemetals:steel_hoe", + "basemetals:steel_leggings", + "basemetals:steel_pickaxe", + "basemetals:steel_scythe", + "basemetals:steel_shears", + "basemetals:steel_shield", + "basemetals:steel_shovel", + "basemetals:steel_sword", + "basemetals:stone_crackhammer", + "basemetals:stone_scythe", + "basemetals:tin_axe", + "basemetals:tin_boots", + "basemetals:tin_bow", + "basemetals:tin_chestplate", + "basemetals:tin_crackhammer", + "basemetals:tin_crossbow", + "basemetals:tin_fishing_rod", + "basemetals:tin_helmet", + "basemetals:tin_hoe", + "basemetals:tin_leggings", + "basemetals:tin_pickaxe", + "basemetals:tin_scythe", + "basemetals:tin_shears", + "basemetals:tin_shield", + "basemetals:tin_shovel", + "basemetals:tin_sword", + "basemetals:wood_crackhammer", + "basemetals:wood_scythe", + "basemetals:zinc_axe", + "basemetals:zinc_boots", + "basemetals:zinc_bow", + "basemetals:zinc_chestplate", + "basemetals:zinc_crackhammer", + "basemetals:zinc_crossbow", + "basemetals:zinc_fishing_rod", + "basemetals:zinc_helmet", + "basemetals:zinc_hoe", + "basemetals:zinc_leggings", + "basemetals:zinc_pickaxe", + "basemetals:zinc_scythe", + "basemetals:zinc_shears", + "basemetals:zinc_shield", + "basemetals:zinc_shovel", + "basemetals:zinc_sword" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/fishing.json b/src/generated/resources/data/minecraft/tags/item/enchantable/fishing.json new file mode 100644 index 000000000..814121fc3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/fishing.json @@ -0,0 +1,32 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_fishing_rod", + "basemetals:antimony_fishing_rod", + "basemetals:aquarium_fishing_rod", + "basemetals:bismuth_fishing_rod", + "basemetals:brass_fishing_rod", + "basemetals:bronze_fishing_rod", + "basemetals:coldiron_fishing_rod", + "basemetals:copper_fishing_rod", + "basemetals:cupronickel_fishing_rod", + "basemetals:diamond_fishing_rod", + "basemetals:electrum_fishing_rod", + "basemetals:emerald_fishing_rod", + "basemetals:gold_fishing_rod", + "basemetals:invar_fishing_rod", + "basemetals:iron_fishing_rod", + "basemetals:lead_fishing_rod", + "basemetals:mithril_fishing_rod", + "basemetals:nickel_fishing_rod", + "basemetals:obsidian_fishing_rod", + "basemetals:pewter_fishing_rod", + "basemetals:platinum_fishing_rod", + "basemetals:quartz_fishing_rod", + "basemetals:silver_fishing_rod", + "basemetals:starsteel_fishing_rod", + "basemetals:steel_fishing_rod", + "basemetals:tin_fishing_rod", + "basemetals:zinc_fishing_rod" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json b/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json new file mode 100644 index 000000000..886b426ee --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json @@ -0,0 +1,185 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_axe", + "basemetals:adamantine_crackhammer", + "basemetals:adamantine_hoe", + "basemetals:adamantine_pickaxe", + "basemetals:adamantine_scythe", + "basemetals:adamantine_shears", + "basemetals:adamantine_shovel", + "basemetals:antimony_axe", + "basemetals:antimony_crackhammer", + "basemetals:antimony_hoe", + "basemetals:antimony_pickaxe", + "basemetals:antimony_scythe", + "basemetals:antimony_shears", + "basemetals:antimony_shovel", + "basemetals:aquarium_axe", + "basemetals:aquarium_crackhammer", + "basemetals:aquarium_hoe", + "basemetals:aquarium_pickaxe", + "basemetals:aquarium_scythe", + "basemetals:aquarium_shears", + "basemetals:aquarium_shovel", + "basemetals:bismuth_axe", + "basemetals:bismuth_crackhammer", + "basemetals:bismuth_hoe", + "basemetals:bismuth_pickaxe", + "basemetals:bismuth_scythe", + "basemetals:bismuth_shears", + "basemetals:bismuth_shovel", + "basemetals:brass_axe", + "basemetals:brass_crackhammer", + "basemetals:brass_hoe", + "basemetals:brass_pickaxe", + "basemetals:brass_scythe", + "basemetals:brass_shears", + "basemetals:brass_shovel", + "basemetals:bronze_axe", + "basemetals:bronze_crackhammer", + "basemetals:bronze_hoe", + "basemetals:bronze_pickaxe", + "basemetals:bronze_scythe", + "basemetals:bronze_shears", + "basemetals:bronze_shovel", + "basemetals:coldiron_axe", + "basemetals:coldiron_crackhammer", + "basemetals:coldiron_hoe", + "basemetals:coldiron_pickaxe", + "basemetals:coldiron_scythe", + "basemetals:coldiron_shears", + "basemetals:coldiron_shovel", + "basemetals:copper_axe", + "basemetals:copper_crackhammer", + "basemetals:copper_hoe", + "basemetals:copper_pickaxe", + "basemetals:copper_scythe", + "basemetals:copper_shears", + "basemetals:copper_shovel", + "basemetals:cupronickel_axe", + "basemetals:cupronickel_crackhammer", + "basemetals:cupronickel_hoe", + "basemetals:cupronickel_pickaxe", + "basemetals:cupronickel_scythe", + "basemetals:cupronickel_shears", + "basemetals:cupronickel_shovel", + "basemetals:diamond_crackhammer", + "basemetals:diamond_scythe", + "basemetals:diamond_shears", + "basemetals:electrum_axe", + "basemetals:electrum_crackhammer", + "basemetals:electrum_hoe", + "basemetals:electrum_pickaxe", + "basemetals:electrum_scythe", + "basemetals:electrum_shears", + "basemetals:electrum_shovel", + "basemetals:emerald_axe", + "basemetals:emerald_crackhammer", + "basemetals:emerald_hoe", + "basemetals:emerald_pickaxe", + "basemetals:emerald_scythe", + "basemetals:emerald_shears", + "basemetals:emerald_shovel", + "basemetals:gold_crackhammer", + "basemetals:gold_scythe", + "basemetals:gold_shears", + "basemetals:invar_axe", + "basemetals:invar_crackhammer", + "basemetals:invar_hoe", + "basemetals:invar_pickaxe", + "basemetals:invar_scythe", + "basemetals:invar_shears", + "basemetals:invar_shovel", + "basemetals:iron_crackhammer", + "basemetals:iron_scythe", + "basemetals:lead_axe", + "basemetals:lead_crackhammer", + "basemetals:lead_hoe", + "basemetals:lead_pickaxe", + "basemetals:lead_scythe", + "basemetals:lead_shears", + "basemetals:lead_shovel", + "basemetals:mithril_axe", + "basemetals:mithril_crackhammer", + "basemetals:mithril_hoe", + "basemetals:mithril_pickaxe", + "basemetals:mithril_scythe", + "basemetals:mithril_shears", + "basemetals:mithril_shovel", + "basemetals:nickel_axe", + "basemetals:nickel_crackhammer", + "basemetals:nickel_hoe", + "basemetals:nickel_pickaxe", + "basemetals:nickel_scythe", + "basemetals:nickel_shears", + "basemetals:nickel_shovel", + "basemetals:obsidian_axe", + "basemetals:obsidian_crackhammer", + "basemetals:obsidian_hoe", + "basemetals:obsidian_pickaxe", + "basemetals:obsidian_scythe", + "basemetals:obsidian_shears", + "basemetals:obsidian_shovel", + "basemetals:pewter_axe", + "basemetals:pewter_crackhammer", + "basemetals:pewter_hoe", + "basemetals:pewter_pickaxe", + "basemetals:pewter_scythe", + "basemetals:pewter_shears", + "basemetals:pewter_shovel", + "basemetals:platinum_axe", + "basemetals:platinum_crackhammer", + "basemetals:platinum_hoe", + "basemetals:platinum_pickaxe", + "basemetals:platinum_scythe", + "basemetals:platinum_shears", + "basemetals:platinum_shovel", + "basemetals:quartz_axe", + "basemetals:quartz_crackhammer", + "basemetals:quartz_hoe", + "basemetals:quartz_pickaxe", + "basemetals:quartz_scythe", + "basemetals:quartz_shears", + "basemetals:quartz_shovel", + "basemetals:silver_axe", + "basemetals:silver_crackhammer", + "basemetals:silver_hoe", + "basemetals:silver_pickaxe", + "basemetals:silver_scythe", + "basemetals:silver_shears", + "basemetals:silver_shovel", + "basemetals:starsteel_axe", + "basemetals:starsteel_crackhammer", + "basemetals:starsteel_hoe", + "basemetals:starsteel_pickaxe", + "basemetals:starsteel_scythe", + "basemetals:starsteel_shears", + "basemetals:starsteel_shovel", + "basemetals:steel_axe", + "basemetals:steel_crackhammer", + "basemetals:steel_hoe", + "basemetals:steel_pickaxe", + "basemetals:steel_scythe", + "basemetals:steel_shears", + "basemetals:steel_shovel", + "basemetals:stone_crackhammer", + "basemetals:stone_scythe", + "basemetals:tin_axe", + "basemetals:tin_crackhammer", + "basemetals:tin_hoe", + "basemetals:tin_pickaxe", + "basemetals:tin_scythe", + "basemetals:tin_shears", + "basemetals:tin_shovel", + "basemetals:wood_crackhammer", + "basemetals:wood_scythe", + "basemetals:zinc_axe", + "basemetals:zinc_crackhammer", + "basemetals:zinc_hoe", + "basemetals:zinc_pickaxe", + "basemetals:zinc_scythe", + "basemetals:zinc_shears", + "basemetals:zinc_shovel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json b/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json new file mode 100644 index 000000000..ef4143ade --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json @@ -0,0 +1,159 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_axe", + "basemetals:adamantine_crackhammer", + "basemetals:adamantine_hoe", + "basemetals:adamantine_pickaxe", + "basemetals:adamantine_scythe", + "basemetals:adamantine_shovel", + "basemetals:antimony_axe", + "basemetals:antimony_crackhammer", + "basemetals:antimony_hoe", + "basemetals:antimony_pickaxe", + "basemetals:antimony_scythe", + "basemetals:antimony_shovel", + "basemetals:aquarium_axe", + "basemetals:aquarium_crackhammer", + "basemetals:aquarium_hoe", + "basemetals:aquarium_pickaxe", + "basemetals:aquarium_scythe", + "basemetals:aquarium_shovel", + "basemetals:bismuth_axe", + "basemetals:bismuth_crackhammer", + "basemetals:bismuth_hoe", + "basemetals:bismuth_pickaxe", + "basemetals:bismuth_scythe", + "basemetals:bismuth_shovel", + "basemetals:brass_axe", + "basemetals:brass_crackhammer", + "basemetals:brass_hoe", + "basemetals:brass_pickaxe", + "basemetals:brass_scythe", + "basemetals:brass_shovel", + "basemetals:bronze_axe", + "basemetals:bronze_crackhammer", + "basemetals:bronze_hoe", + "basemetals:bronze_pickaxe", + "basemetals:bronze_scythe", + "basemetals:bronze_shovel", + "basemetals:coldiron_axe", + "basemetals:coldiron_crackhammer", + "basemetals:coldiron_hoe", + "basemetals:coldiron_pickaxe", + "basemetals:coldiron_scythe", + "basemetals:coldiron_shovel", + "basemetals:copper_axe", + "basemetals:copper_crackhammer", + "basemetals:copper_hoe", + "basemetals:copper_pickaxe", + "basemetals:copper_scythe", + "basemetals:copper_shovel", + "basemetals:cupronickel_axe", + "basemetals:cupronickel_crackhammer", + "basemetals:cupronickel_hoe", + "basemetals:cupronickel_pickaxe", + "basemetals:cupronickel_scythe", + "basemetals:cupronickel_shovel", + "basemetals:diamond_crackhammer", + "basemetals:diamond_scythe", + "basemetals:electrum_axe", + "basemetals:electrum_crackhammer", + "basemetals:electrum_hoe", + "basemetals:electrum_pickaxe", + "basemetals:electrum_scythe", + "basemetals:electrum_shovel", + "basemetals:emerald_axe", + "basemetals:emerald_crackhammer", + "basemetals:emerald_hoe", + "basemetals:emerald_pickaxe", + "basemetals:emerald_scythe", + "basemetals:emerald_shovel", + "basemetals:gold_crackhammer", + "basemetals:gold_scythe", + "basemetals:invar_axe", + "basemetals:invar_crackhammer", + "basemetals:invar_hoe", + "basemetals:invar_pickaxe", + "basemetals:invar_scythe", + "basemetals:invar_shovel", + "basemetals:iron_crackhammer", + "basemetals:iron_scythe", + "basemetals:lead_axe", + "basemetals:lead_crackhammer", + "basemetals:lead_hoe", + "basemetals:lead_pickaxe", + "basemetals:lead_scythe", + "basemetals:lead_shovel", + "basemetals:mithril_axe", + "basemetals:mithril_crackhammer", + "basemetals:mithril_hoe", + "basemetals:mithril_pickaxe", + "basemetals:mithril_scythe", + "basemetals:mithril_shovel", + "basemetals:nickel_axe", + "basemetals:nickel_crackhammer", + "basemetals:nickel_hoe", + "basemetals:nickel_pickaxe", + "basemetals:nickel_scythe", + "basemetals:nickel_shovel", + "basemetals:obsidian_axe", + "basemetals:obsidian_crackhammer", + "basemetals:obsidian_hoe", + "basemetals:obsidian_pickaxe", + "basemetals:obsidian_scythe", + "basemetals:obsidian_shovel", + "basemetals:pewter_axe", + "basemetals:pewter_crackhammer", + "basemetals:pewter_hoe", + "basemetals:pewter_pickaxe", + "basemetals:pewter_scythe", + "basemetals:pewter_shovel", + "basemetals:platinum_axe", + "basemetals:platinum_crackhammer", + "basemetals:platinum_hoe", + "basemetals:platinum_pickaxe", + "basemetals:platinum_scythe", + "basemetals:platinum_shovel", + "basemetals:quartz_axe", + "basemetals:quartz_crackhammer", + "basemetals:quartz_hoe", + "basemetals:quartz_pickaxe", + "basemetals:quartz_scythe", + "basemetals:quartz_shovel", + "basemetals:silver_axe", + "basemetals:silver_crackhammer", + "basemetals:silver_hoe", + "basemetals:silver_pickaxe", + "basemetals:silver_scythe", + "basemetals:silver_shovel", + "basemetals:starsteel_axe", + "basemetals:starsteel_crackhammer", + "basemetals:starsteel_hoe", + "basemetals:starsteel_pickaxe", + "basemetals:starsteel_scythe", + "basemetals:starsteel_shovel", + "basemetals:steel_axe", + "basemetals:steel_crackhammer", + "basemetals:steel_hoe", + "basemetals:steel_pickaxe", + "basemetals:steel_scythe", + "basemetals:steel_shovel", + "basemetals:stone_crackhammer", + "basemetals:stone_scythe", + "basemetals:tin_axe", + "basemetals:tin_crackhammer", + "basemetals:tin_hoe", + "basemetals:tin_pickaxe", + "basemetals:tin_scythe", + "basemetals:tin_shovel", + "basemetals:wood_crackhammer", + "basemetals:wood_scythe", + "basemetals:zinc_axe", + "basemetals:zinc_crackhammer", + "basemetals:zinc_hoe", + "basemetals:zinc_pickaxe", + "basemetals:zinc_scythe", + "basemetals:zinc_shovel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/foot_armor.json b/src/generated/resources/data/minecraft/tags/item/foot_armor.json new file mode 100644 index 000000000..a68779489 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/foot_armor.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_boots", + "basemetals:antimony_boots", + "basemetals:aquarium_boots", + "basemetals:bismuth_boots", + "basemetals:brass_boots", + "basemetals:bronze_boots", + "basemetals:coldiron_boots", + "basemetals:copper_boots", + "basemetals:cupronickel_boots", + "basemetals:electrum_boots", + "basemetals:emerald_boots", + "basemetals:invar_boots", + "basemetals:lead_boots", + "basemetals:mithril_boots", + "basemetals:nickel_boots", + "basemetals:obsidian_boots", + "basemetals:pewter_boots", + "basemetals:platinum_boots", + "basemetals:quartz_boots", + "basemetals:silver_boots", + "basemetals:starsteel_boots", + "basemetals:steel_boots", + "basemetals:tin_boots", + "basemetals:zinc_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/head_armor.json b/src/generated/resources/data/minecraft/tags/item/head_armor.json new file mode 100644 index 000000000..3f831e294 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/head_armor.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_helmet", + "basemetals:antimony_helmet", + "basemetals:aquarium_helmet", + "basemetals:bismuth_helmet", + "basemetals:brass_helmet", + "basemetals:bronze_helmet", + "basemetals:coldiron_helmet", + "basemetals:copper_helmet", + "basemetals:cupronickel_helmet", + "basemetals:electrum_helmet", + "basemetals:emerald_helmet", + "basemetals:invar_helmet", + "basemetals:lead_helmet", + "basemetals:mithril_helmet", + "basemetals:nickel_helmet", + "basemetals:obsidian_helmet", + "basemetals:pewter_helmet", + "basemetals:platinum_helmet", + "basemetals:quartz_helmet", + "basemetals:silver_helmet", + "basemetals:starsteel_helmet", + "basemetals:steel_helmet", + "basemetals:tin_helmet", + "basemetals:zinc_helmet" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/hoes.json b/src/generated/resources/data/minecraft/tags/item/hoes.json new file mode 100644 index 000000000..ac4a81525 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/hoes.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_hoe", + "basemetals:antimony_hoe", + "basemetals:aquarium_hoe", + "basemetals:bismuth_hoe", + "basemetals:brass_hoe", + "basemetals:bronze_hoe", + "basemetals:coldiron_hoe", + "basemetals:copper_hoe", + "basemetals:cupronickel_hoe", + "basemetals:electrum_hoe", + "basemetals:emerald_hoe", + "basemetals:invar_hoe", + "basemetals:lead_hoe", + "basemetals:mithril_hoe", + "basemetals:nickel_hoe", + "basemetals:obsidian_hoe", + "basemetals:pewter_hoe", + "basemetals:platinum_hoe", + "basemetals:quartz_hoe", + "basemetals:silver_hoe", + "basemetals:starsteel_hoe", + "basemetals:steel_hoe", + "basemetals:tin_hoe", + "basemetals:zinc_hoe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/leg_armor.json b/src/generated/resources/data/minecraft/tags/item/leg_armor.json new file mode 100644 index 000000000..3416ebd01 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/leg_armor.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_leggings", + "basemetals:antimony_leggings", + "basemetals:aquarium_leggings", + "basemetals:bismuth_leggings", + "basemetals:brass_leggings", + "basemetals:bronze_leggings", + "basemetals:coldiron_leggings", + "basemetals:copper_leggings", + "basemetals:cupronickel_leggings", + "basemetals:electrum_leggings", + "basemetals:emerald_leggings", + "basemetals:invar_leggings", + "basemetals:lead_leggings", + "basemetals:mithril_leggings", + "basemetals:nickel_leggings", + "basemetals:obsidian_leggings", + "basemetals:pewter_leggings", + "basemetals:platinum_leggings", + "basemetals:quartz_leggings", + "basemetals:silver_leggings", + "basemetals:starsteel_leggings", + "basemetals:steel_leggings", + "basemetals:tin_leggings", + "basemetals:zinc_leggings" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/pickaxes.json b/src/generated/resources/data/minecraft/tags/item/pickaxes.json new file mode 100644 index 000000000..0b523aceb --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/pickaxes.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_pickaxe", + "basemetals:antimony_pickaxe", + "basemetals:aquarium_pickaxe", + "basemetals:bismuth_pickaxe", + "basemetals:brass_pickaxe", + "basemetals:bronze_pickaxe", + "basemetals:coldiron_pickaxe", + "basemetals:copper_pickaxe", + "basemetals:cupronickel_pickaxe", + "basemetals:electrum_pickaxe", + "basemetals:emerald_pickaxe", + "basemetals:invar_pickaxe", + "basemetals:lead_pickaxe", + "basemetals:mithril_pickaxe", + "basemetals:nickel_pickaxe", + "basemetals:obsidian_pickaxe", + "basemetals:pewter_pickaxe", + "basemetals:platinum_pickaxe", + "basemetals:quartz_pickaxe", + "basemetals:silver_pickaxe", + "basemetals:starsteel_pickaxe", + "basemetals:steel_pickaxe", + "basemetals:tin_pickaxe", + "basemetals:zinc_pickaxe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/shovels.json b/src/generated/resources/data/minecraft/tags/item/shovels.json new file mode 100644 index 000000000..9e8f220d8 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/shovels.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_shovel", + "basemetals:antimony_shovel", + "basemetals:aquarium_shovel", + "basemetals:bismuth_shovel", + "basemetals:brass_shovel", + "basemetals:bronze_shovel", + "basemetals:coldiron_shovel", + "basemetals:copper_shovel", + "basemetals:cupronickel_shovel", + "basemetals:electrum_shovel", + "basemetals:emerald_shovel", + "basemetals:invar_shovel", + "basemetals:lead_shovel", + "basemetals:mithril_shovel", + "basemetals:nickel_shovel", + "basemetals:obsidian_shovel", + "basemetals:pewter_shovel", + "basemetals:platinum_shovel", + "basemetals:quartz_shovel", + "basemetals:silver_shovel", + "basemetals:starsteel_shovel", + "basemetals:steel_shovel", + "basemetals:tin_shovel", + "basemetals:zinc_shovel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/swords.json b/src/generated/resources/data/minecraft/tags/item/swords.json new file mode 100644 index 000000000..235013450 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/swords.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "basemetals:adamantine_sword", + "basemetals:antimony_sword", + "basemetals:aquarium_sword", + "basemetals:bismuth_sword", + "basemetals:brass_sword", + "basemetals:bronze_sword", + "basemetals:coldiron_sword", + "basemetals:copper_sword", + "basemetals:cupronickel_sword", + "basemetals:electrum_sword", + "basemetals:emerald_sword", + "basemetals:invar_sword", + "basemetals:lead_sword", + "basemetals:mithril_sword", + "basemetals:nickel_sword", + "basemetals:obsidian_sword", + "basemetals:pewter_sword", + "basemetals:platinum_sword", + "basemetals:quartz_sword", + "basemetals:silver_sword", + "basemetals:starsteel_sword", + "basemetals:steel_sword", + "basemetals:tin_sword", + "basemetals:zinc_sword" + ] +} \ No newline at end of file diff --git a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java index eba1178b6..e6439e4b4 100644 --- a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java +++ b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java @@ -11,7 +11,6 @@ import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.searchtree.SearchRegistry; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.server.level.ServerLevel; @@ -202,7 +201,7 @@ private static void verifyOreOverlayModels(Minecraft minecraft) { if (Boolean.getBoolean("basemetals.hostTextureProbe")) { try { var host = minecraft.getResourceManager().getResource( - new net.minecraft.resources.ResourceLocation("minecraft:textures/block/stone.png")); + net.minecraft.resources.ResourceLocation.parse("minecraft:textures/block/stone.png")); if (!host.orElseThrow().sourcePackId().contains("basemetals-host-test")) { throw new IllegalStateException("The ore host texture did not come from the replacement pack"); } @@ -320,26 +319,33 @@ private static void verifyBlockRenderLayers(Minecraft minecraft) { private static void verifyCreativeBuckets(Minecraft minecraft) { NonNullList itemsTab = NonNullList.create(); NonNullList searchTab = NonNullList.create(); - net.minecraft.world.item.CreativeModeTabs.tryRebuildTabContents( - net.minecraft.world.flag.FeatureFlags.VANILLA_SET, true, - minecraft.level.registryAccess()); + var previousMenu = minecraft.player.containerMenu; + try { + // Opening the native inventory also builds this connection's search index. + new net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen( + minecraft.player, minecraft.level.enabledFeatures(), true); + } finally { + minecraft.player.containerMenu = previousMenu; + } itemsTab.addAll(ModTabs.ITEMS.get().getDisplayItems()); searchTab.addAll(net.minecraft.world.item.CreativeModeTabs.searchTab().getDisplayItems()); var shown = new java.util.HashSet(); for (var tab : java.util.List.of(ModTabs.BLOCKS.get(), ModTabs.ITEMS.get(), ModTabs.TOOLS.get(), ModTabs.COMBAT.get())) { tab.getDisplayItems().forEach(stack -> shown.add(stack.getItem())); } - var indexed = minecraft.getSearchTree(SearchRegistry.CREATIVE_NAMES).search("basemetals:") + var indexed = minecraft.getConnection().searchTrees().creativeNameSearch().search("basemetals:") .stream().map(ItemStack::getItem).collect(java.util.stream.Collectors.toSet()); ModContent.itemsById().forEach((id, item) -> { boolean expected = !ModContent.fluids().containsKey(id); if (shown.contains(item.get()) != expected || indexed.contains(item.get()) != expected) { - throw new IllegalStateException("Creative visibility changed for " + id); + throw new IllegalStateException("Creative visibility changed for " + id + + ": tabs=" + shown.contains(item.get()) + ", search=" + indexed.contains(item.get()) + + ", expected=" + expected); } }); BaseMetals.LOGGER.info("BASEMETALS_CREATIVE_INVENTORY PASS visible={} hidden_fluid_blocks=36", shown.size()); - java.util.List bucketSearch = minecraft - .getSearchTree(SearchRegistry.CREATIVE_NAMES).search("bucket"); + java.util.List bucketSearch = minecraft.getConnection().searchTrees() + .creativeNameSearch().search("bucket"); for (var fluid : ModContent.fluids().entrySet()) { net.minecraft.world.item.Item bucket = fluid.getValue().bucket().get(); ItemStack bucketStack = bucket.getDefaultInstance(); diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java index 1dae37588..1d547ead0 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java @@ -51,6 +51,11 @@ static void onCrafted(ServerPlayer player, ItemStack result) { } static void onSmelted(ServerPlayer player, ItemStack result) { + if (result.is(net.minecraft.world.item.Items.COPPER_INGOT)) { + award(player, "this_is_new"); + return; + } + ResourceLocation id = ForgeRegistries.ITEMS.getKey(result.getItem()); if (id == null || !id.getNamespace().equals(BaseMetals.MOD_ID) || !id.getPath().endsWith("_ingot")) { @@ -64,7 +69,8 @@ static void onSmelted(ServerPlayer player, ItemStack result) { static void onPlaced(ServerPlayer player, BlockState state) { ResourceLocation id = ForgeRegistries.BLOCKS.getKey(state.getBlock()); - if (id != null && id.getNamespace().equals(BaseMetals.MOD_ID) && state.is(STORAGE_BLOCKS)) { + if (id != null && (id.getNamespace().equals(BaseMetals.MOD_ID) + || state.is(net.minecraft.world.level.block.Blocks.COPPER_BLOCK)) && state.is(STORAGE_BLOCKS)) { award(player, "blocktastic"); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java index 7836e9eca..759616689 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -16,7 +16,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectCategory; import net.minecraft.world.effect.MobEffects; @@ -87,7 +87,7 @@ public void onBreak(BlockEvent.BreakEvent event) { if (held.getItem() instanceof CrackhammerItem && !player.isCreative() && event.getState().canHarvestBlock(level, event.getPos(), player)) { Optional> recipe = level.getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), - new SimpleContainer(new ItemStack(event.getState().getBlock())), level); + new SingleRecipeInput(new ItemStack(event.getState().getBlock())), level); if (recipe.isPresent()) { event.setCanceled(true); event.getState().getBlock().playerWillDestroy(level, event.getPos(), event.getState(), player); diff --git a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java index 000240546..8631c141a 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java @@ -56,7 +56,7 @@ public static void clientSetup(FMLClientSetupEvent event) { if (item instanceof MaterialItems.Bow || item instanceof MaterialItems.Crossbow) { ItemProperties.register(item, ResourceLocation.parse("pull"), (stack, level, user, seed) -> user == null || user.getUseItem() != stack ? 0.0F - : (float) (stack.getUseDuration() - user.getUseItemRemainingTicks()) / 20.0F); + : (float) (stack.getUseDuration(user) - user.getUseItemRemainingTicks()) / 20.0F); ItemProperties.register(item, ResourceLocation.parse("pulling"), (stack, level, user, seed) -> user != null && user.isUsingItem() && user.getUseItem() == stack ? 1.0F : 0.0F); } diff --git a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java index 3284fb223..f84848842 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java @@ -38,13 +38,12 @@ public void render(MaterialProjectile projectile, float yaw, float partialTicks, public void vertex(PoseStack.Pose pose, VertexConsumer vertices, int x, int y, int z, float u, float v, int normalX, int normalY, int normalZ, int packedLight) { - vertices.vertex(pose, x, y, z) - .color((colour >> 16) & 0xFF, (colour >> 8) & 0xFF, colour & 0xFF, 0xFF) - .uv(u, v) - .overlayCoords(OverlayTexture.NO_OVERLAY) - .uv2(packedLight) - .normal(pose, normalX, normalZ, normalY) - .endVertex(); + vertices.addVertex(pose, x, y, z) + .setColor((colour >> 16) & 0xFF, (colour >> 8) & 0xFF, colour & 0xFF, 0xFF) + .setUv(u, v) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(packedLight) + .setNormal(pose, normalX, normalZ, normalY); } @Override diff --git a/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java b/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java new file mode 100644 index 000000000..5ba6055f6 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java @@ -0,0 +1,36 @@ +package zone.moddev.mc.basemetals.compat; + +import java.util.Map; + +/** Uses vanilla copper for new items while keeping the old Base Metals IDs valid. */ +public final class VanillaCopper { + private static final Map EQUIVALENTS = Map.of( + "basemetals:copper_ingot", "minecraft:copper_ingot", + "basemetals:copper_block", "minecraft:copper_block", + "basemetals:copper_door", "minecraft:copper_door", + "basemetals:copper_trapdoor", "minecraft:copper_trapdoor", + "basemetals:copper_slab", "minecraft:cut_copper_slab", + "basemetals:copper_stairs", "minecraft:cut_copper_stairs"); + + private static final Map INGREDIENT_TAGS = Map.of( + "basemetals:copper_ingot", "forge:ingots/copper", + "basemetals:copper_block", "forge:storage_blocks/copper", + "basemetals:copper_door", "forge:doors/copper", + "basemetals:copper_trapdoor", "forge:trapdoors/copper", + "basemetals:copper_slab", "forge:slabs/copper", + "basemetals:copper_stairs", "forge:stairs/copper"); + + private VanillaCopper() {} + + public static String output(String itemId) { + return EQUIVALENTS.getOrDefault(itemId, itemId); + } + + public static String ingredientTag(String itemId) { + return INGREDIENT_TAGS.get(itemId); + } + + public static Map equivalents() { + return EQUIVALENTS; + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java index 8035124b8..c67d809d4 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java @@ -30,8 +30,8 @@ public BaseMetalAmmoItem(MaterialDefinition material, Kind kind, @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override - public AbstractArrow createArrow(Level level, ItemStack stack, LivingEntity shooter) { - MaterialProjectile projectile = new MaterialProjectile(entityType.get(), level, shooter, stack); + public AbstractArrow createArrow(Level level, ItemStack stack, LivingEntity shooter, ItemStack weapon) { + MaterialProjectile projectile = new MaterialProjectile(entityType.get(), level, shooter, stack, weapon); projectile.setBaseDamage(1.0D + material.baseAttackDamage()); return projectile; } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java index 9c5023694..590d9c114 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java @@ -8,7 +8,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.InteractionResult; -import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.DiggerItem; @@ -67,7 +67,7 @@ public InteractionResult useOn(UseOnContext context) { for (ItemEntity entity : entities) { ItemStack input = entity.getItem(); Optional> recipe = context.getLevel().getRecipeManager().getRecipeFor( - CrushingRecipe.TYPE.get(), new SimpleContainer(input), context.getLevel()); + CrushingRecipe.TYPE.get(), new SingleRecipeInput(input), context.getLevel()); if (recipe.isEmpty() || !canCrushDroppedBlock(context.getItemInHand(), input)) continue; // Sneaking is the per-use full-stack control; ordinary use crushes // one item and never changes a persistent config contract. diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java index 5e1e6dc20..5372db768 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java @@ -7,6 +7,7 @@ import com.google.common.collect.Multimap; import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.Registries; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; @@ -100,10 +101,10 @@ public static final class Hoe extends HoeItem implements MaterialBacked { private final MaterialDefinition material; public Hoe(MaterialDefinition material, Properties properties) { super(new MaterialTier(material), properties.attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, - "Tool modifier", 0.0D, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_UUID, - "Tool modifier", material.baseAttackDamage() - 3.0D, + .add(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_ID, + 0.0D, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) + .add(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_ID, + material.baseAttackDamage() - 3.0D, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) .build())); this.material = material; @@ -247,9 +248,10 @@ public static final class Crossbow extends BowItem implements MaterialBacked { public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int timeLeft) { if (!(user instanceof Player player)) return; boolean hasInfiniteAmmo = player.getAbilities().instabuild - || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY, bow) > 0; + || EnchantmentHelper.getItemEnchantmentLevel(player.registryAccess() + .lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(Enchantments.INFINITY), bow) > 0; ItemStack ammunition = findBolt(player); - int charge = getUseDuration(bow) - timeLeft; + int charge = getUseDuration(bow, user) - timeLeft; charge = net.minecraftforge.event.ForgeEventFactory.onArrowLoose( bow, level, player, charge, !ammunition.isEmpty() || hasInfiniteAmmo); if (charge < 0 || ammunition.isEmpty() && !hasInfiniteAmmo) return; @@ -267,20 +269,12 @@ public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int time boolean infiniteShot = player.getAbilities().instabuild || boltItem.isInfinite(ammunition, bow, player); if (!level.isClientSide) { - AbstractArrow bolt = boltItem.createArrow(level, ammunition, player); + AbstractArrow bolt = boltItem.createArrow(level, ammunition, player, bow); bolt.setBaseDamage(bolt.getBaseDamage() + material.baseAttackDamage() - 1.0D); bolt.shootFromRotation(player, player.getXRot(), player.getYRot(), 0.0F, power * 3.0F, 1.0F); if (power == 1.0F) bolt.setCritArrow(true); - int powerLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER, bow); - if (powerLevel > 0) { - bolt.setBaseDamage(bolt.getBaseDamage() + powerLevel * 0.5D + 0.5D); - } - int punchLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH, bow); - if (punchLevel > 0) bolt.setKnockback(punchLevel); - if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAME, bow) > 0) { - bolt.igniteForSeconds(100); - } + // The saved weapon lets vanilla apply Power, Punch and Flame once. bow.hurtAndBreak(1, player, LivingEntity.getSlotForHand(player.getUsedItemHand())); if (infiniteShot) bolt.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; level.addFreshEntity(bolt); diff --git a/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java b/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java index 3227be191..5769d56ea 100644 --- a/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java +++ b/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java @@ -23,9 +23,13 @@ public MaterialProjectile(EntityType type, Level l public MaterialProjectile(EntityType type, Level level, LivingEntity shooter, ItemStack ammunition) { - this(type, level); - setOwner(shooter); - setPos(shooter.getX(), shooter.getEyeY() - 0.1D, shooter.getZ()); + this(type, level, shooter, ammunition, null); + } + + public MaterialProjectile(EntityType type, Level level, + LivingEntity shooter, ItemStack ammunition, ItemStack weapon) { + super(type, shooter, level, ammunition.copyWithCount(1), weapon); + this.ammunition = ammunition.copy(); this.ammunition.setCount(1); setPickupItemStack(this.ammunition); @@ -77,7 +81,8 @@ public void readAdditionalSaveData(CompoundTag tag) { * projectile's first render. */ @Override - public Packet getAddEntityPacket() { + public Packet getAddEntityPacket( + net.minecraft.server.level.ServerEntity tracking) { return ForgeHooks.getEntitySpawnPacket(this); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java index 8f9be9365..feaf84490 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java @@ -1,6 +1,5 @@ package zone.moddev.mc.basemetals.migration; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -24,8 +23,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.zip.GZIPInputStream; -import java.util.zip.InflaterInputStream; import java.util.zip.DeflaterOutputStream; import zone.moddev.mc.basemetals.BaseMetals; @@ -65,6 +62,10 @@ import net.minecraft.world.level.block.state.properties.Half; import net.minecraft.world.level.block.state.properties.SlabType; import net.minecraft.world.level.block.state.properties.StairsShape; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.chunk.storage.RegionFile; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.chunk.storage.RegionStorageInfo; import net.minecraftforge.registries.ForgeRegistries; /** @@ -80,14 +81,57 @@ public final class Legacy112WorldMigrator { private static final int SECTOR_BYTES = 4_096; private static final String MARKER = "BASEMETALS_1_12_BLOCK_MIGRATION_COMPLETE.txt"; private static final String BACKUP_DIRECTORY = "basemetals-1.12-region-backup"; + private static Path preparedWorld; + private static CompoundTag preparedPlayer; + private static int preparedVersion; private Legacy112WorldMigrator() {} + static void beginWorldLoad() { + preparedWorld = null; + preparedPlayer = null; + preparedVersion = 0; + } + + /** Keep the original player before Forge and vanilla read the old save. */ + static void prepareWorld(Path levelDat, CompoundTag root) { + if (!isLegacyLevel(root)) return; + + CompoundTag data = root.getCompound("Data"); + preparedWorld = levelDat.toAbsolutePath().normalize().getParent(); + preparedVersion = data.getInt("DataVersion"); + preparedPlayer = data.contains("Player", Tag.TAG_COMPOUND) ? data.getCompound("Player").copy() : null; + } + + private static boolean isLegacyLevel(CompoundTag root) { + CompoundTag data = root.getCompound("Data"); + return data.contains("DataVersion", Tag.TAG_ANY_NUMERIC) + && data.getInt("DataVersion") <= LAST_SUPPORTED_LEGACY_DATA_VERSION; + } + + private static boolean hasLegacySource(Path root) throws IOException { + if (root.equals(preparedWorld) || isLegacyLevel(LegacyNbt.readCompressed(root.resolve("level.dat").toFile()))) { + return true; + } + + // This sidecar survives Forge's first rewrite. An old level.dat_old alone + // is not evidence that the current world still needs flattening. + Path sidecar = root.resolve("basemetals-legacy-registry.dat"); + if (!Files.isRegularFile(sidecar)) return false; + + CompoundTag source = LegacyNbt.readCompressed(sidecar.toFile()); + return isLegacyLevel(source) || oldBlockIds(source).values().stream() + .map(Legacy112WorldMigrator::normalizeLegacyRegistryName) + .anyMatch(id -> id.startsWith(BaseMetals.MOD_ID + ":") || id.startsWith("mmdlib:")); + } + public static void migrateIfNeeded(Path worldRoot) throws IOException { Path root = worldRoot.toAbsolutePath().normalize(); if (Files.isRegularFile(root.resolve(MARKER))) return; if (!Files.isRegularFile(root.resolve("level.dat"))) return; + if (!hasLegacySource(root)) return; + Map oldBlockIds = legacyBlockIds(root); if (oldBlockIds.values().stream().noneMatch(id -> id.startsWith(BaseMetals.MOD_ID + ":"))) return; @@ -170,12 +214,13 @@ private static Map oldBlockIds(CompoundTag level) { } private static Map legacyBlockIds(Path root) throws IOException { - for (String fileName : List.of("level.dat", "level.dat_old", "basemetals-legacy-registry.dat")) { + for (String fileName : List.of("level.dat", "basemetals-legacy-registry.dat", "level.dat_old")) { Path file = root.resolve(fileName); if (!Files.isRegularFile(file)) continue; CompoundTag candidate = LegacyNbt.readCompressed(file.toFile()); int dataVersion = candidate.getCompound("Data").getInt("DataVersion"); - if (dataVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION) continue; + if (dataVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION + && !fileName.equals("basemetals-legacy-registry.dat")) continue; Map ids = oldBlockIds(candidate); if (!ids.isEmpty()) return ids; } @@ -202,7 +247,7 @@ private static Map embeddedBlockIds() throws IOException { private static List findRegionFiles(Path root) throws IOException { List result = new ArrayList<>(); - try (var paths = Files.walk(root, 4)) { + try (var paths = Files.walk(root)) { paths.filter(Files::isRegularFile) .filter(path -> path.getFileName().toString().matches("r\\.-?\\d+\\.-?\\d+\\.mca")) .filter(path -> path.getParent() != null && path.getParent().getFileName().toString().equals("region")) @@ -229,6 +274,7 @@ private static void ensureBackupCapacity(Path root, List regions) throws I private static RegionConversion convertRegion(Path root, Path region, Map ids) throws IOException { byte[] source = Files.readAllBytes(region); + if (source.length == 0) return new RegionConversion(0, 0, 0, 0, 0, 0); if (source.length < REGION_HEADER_BYTES) throw new IOException("Invalid region header: " + region); ByteBuffer locations = ByteBuffer.wrap(source, 0, SECTOR_BYTES).order(ByteOrder.BIG_ENDIAN); byte[] timestamps = Arrays.copyOfRange(source, SECTOR_BYTES, REGION_HEADER_BYTES); @@ -239,44 +285,65 @@ private static RegionConversion convertRegion(Path root, Path region, Map externalFiles = new java.util.LinkedHashSet<>(); + String[] coordinates = region.getFileName().toString().split("\\."); + int regionX = Integer.parseInt(coordinates[1]); + int regionZ = Integer.parseInt(coordinates[2]); + + try (RegionFile reader = new RegionFile(new RegionStorageInfo("Base Metals migration", Level.OVERWORLD, "chunk"), + region, region.getParent(), false)) { + for (int index = 0; index < 1_024; index++) { + int location = locations.getInt(index * 4); + if (location == 0) continue; + int offset = location >>> 8; + int position = offset * SECTOR_BYTES; + if (position < REGION_HEADER_BYTES || position + 5 > source.length) { + throw new IOException("Invalid chunk offset in " + region + " entry " + index); + } + int length = intAt(source, position); + if (length < 1 || position + 4 + length > source.length) { + throw new IOException("Invalid chunk length in " + region + " entry " + index); + } + int compression = source[position + 4] & 0xff; + ChunkPos chunkPos = new ChunkPos(regionX * 32 + (index & 31), regionZ * 32 + (index >>> 5)); + if ((compression & 128) != 0) { + externalFiles.add(region.getParent().resolve("c." + chunkPos.x + "." + chunkPos.z + ".mcc")); + } - for (int index = 0; index < 1_024; index++) { - int location = locations.getInt(index * 4); - if (location == 0) continue; - int offset = location >>> 8; - int position = offset * SECTOR_BYTES; - if (position < REGION_HEADER_BYTES || position + 5 > source.length) { - throw new IOException("Invalid chunk offset in " + region + " entry " + index); - } - int length = intAt(source, position); - if (length < 1 || position + 4 + length > source.length) { - throw new IOException("Invalid chunk length in " + region + " entry " + index); - } - int compression = source[position + 4] & 0xff; - byte[] payload = Arrays.copyOfRange(source, position + 5, position + 4 + length); - CompoundTag chunk = readChunk(payload, compression); - ChunkConversion conversion = convertChunk(chunk, ids); - byte[] record; - if (conversion.converted()) { - record = writeChunk(conversion.chunk()); - converted++; - externalStates += conversion.externalStates(); - preservedBlockEntities += conversion.preservedBlockEntities(); - convertedBuckets += conversion.convertedBuckets(); - convertedItemAliases += conversion.convertedItemAliases(); - convertedDamageValues += conversion.convertedDamageValues(); - } else { - record = Arrays.copyOfRange(source, position, position + 4 + length); + CompoundTag chunk; + try (DataInputStream input = reader.getChunkDataInputStream(chunkPos)) { + if (input == null) throw new IOException("Could not read chunk " + chunkPos + " in " + region); + chunk = LegacyNbt.read(input); + } + + ChunkConversion conversion = convertChunk(chunk, ids); + byte[] record; + if (conversion.converted()) { + record = writeChunk(conversion.chunk()); + converted++; + externalStates += conversion.externalStates(); + preservedBlockEntities += conversion.preservedBlockEntities(); + convertedBuckets += conversion.convertedBuckets(); + convertedItemAliases += conversion.convertedItemAliases(); + convertedDamageValues += conversion.convertedDamageValues(); + } else { + record = Arrays.copyOfRange(source, position, position + 4 + length); + } + chunks.add(new RegionChunk(index, record)); } - chunks.add(new RegionChunk(index, record)); } if (converted == 0) return new RegionConversion(0, 0, 0, 0, 0, 0); - ensureBackupCapacity(root, List.of(region)); + List originals = new ArrayList<>(externalFiles); + originals.add(region); + ensureBackupCapacity(root, originals); byte[] output = buildRegion(chunks, timestamps); - Path backup = root.resolve(BACKUP_DIRECTORY).resolve(root.relativize(region)); - Files.createDirectories(backup.getParent()); - if (!Files.exists(backup)) Files.copy(region, backup, StandardCopyOption.COPY_ATTRIBUTES); + + for (Path original : originals) { + Path backup = root.resolve(BACKUP_DIRECTORY).resolve(root.relativize(original)); + Files.createDirectories(backup.getParent()); + if (!Files.exists(backup)) Files.copy(original, backup, StandardCopyOption.COPY_ATTRIBUTES); + } Path temporary = region.resolveSibling(region.getFileName() + ".basemetals.tmp"); Files.write(temporary, output, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); @@ -358,17 +425,10 @@ private static ItemMigration migrateLooseInventories(Path root) throws IOExcepti return converted; } - /** - * Forge can rewrite level.dat before ServerAboutToStartEvent, which means - * Mojang has already interpreted a legacy mod tool's Damage field as - * flattening metadata. The untouched legacy player remains in - * level.dat_old, so rebuild only that player record through the normal - * player data fixer after first protecting mod durability and aliases. - */ + /** Restore only the player captured from this load's original legacy save. */ private static ItemMigration restoreRewrittenSingleplayerPlayer(Path root) throws IOException { Path currentFile = root.resolve("level.dat"); - Path legacyFile = root.resolve("level.dat_old"); - if (!Files.isRegularFile(currentFile) || !Files.isRegularFile(legacyFile)) { + if (!root.equals(preparedWorld) || preparedPlayer == null || !Files.isRegularFile(currentFile)) { return ItemMigration.NONE; } @@ -379,18 +439,10 @@ private static ItemMigration restoreRewrittenSingleplayerPlayer(Path root) throw return ItemMigration.NONE; } - CompoundTag legacy = LegacyNbt.readCompressed(legacyFile.toFile()); - CompoundTag legacyData = legacy.getCompound("Data"); - int legacyVersion = legacyData.getInt("DataVersion"); - if (legacyVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION - || !legacyData.contains("Player", Tag.TAG_COMPOUND)) { - return ItemMigration.NONE; - } - - CompoundTag player = legacyData.getCompound("Player").copy(); + CompoundTag player = preparedPlayer.copy(); ItemMigration migration = convertLegacyItems(player); CompoundTag fixedPlayer = DataFixTypes.PLAYER.updateToCurrentVersion(DataFixers.getDataFixer(), - player, legacyVersion); + player, preparedVersion); currentData.put("Player", fixedPlayer); Path backup = root.resolve(BACKUP_DIRECTORY).resolve(root.relativize(currentFile)); @@ -793,18 +845,6 @@ private static int nibble(byte[] values, int index) { return value >>> ((index & 1) * 4) & 15; } - private static CompoundTag readChunk(byte[] payload, int compression) throws IOException { - InputStream input = switch (compression) { - case 1 -> new GZIPInputStream(new ByteArrayInputStream(payload)); - case 2 -> new InflaterInputStream(new ByteArrayInputStream(payload)); - case 3 -> new ByteArrayInputStream(payload); - default -> throw new IOException("Unsupported region compression type " + compression); - }; - try (DataInputStream data = new DataInputStream(input)) { - return LegacyNbt.read(data); - } - } - private static byte[] writeChunk(CompoundTag chunk) throws IOException { ByteArrayOutputStream compressed = new ByteArrayOutputStream(); try (OutputStream deflater = new DeflaterOutputStream(compressed); diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java index 037a3c61b..dd65498e6 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java @@ -11,6 +11,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; @@ -89,6 +90,7 @@ private LegacyWorldDataHook() {} /** Called by the coremod before Forge reads level.dat. */ public static synchronized void prepareLegacyWorld(File levelDat) { + Legacy112WorldMigrator.beginWorldLoad(); legacyWorldActive = false; legacyTerrainChunks = Collections.emptyMap(); LEGACY_BASE_METALS_BLOCK_COUNTS.clear(); @@ -117,15 +119,38 @@ private static void prepareLevelMetadata(File levelDat) { try (FileInputStream input = new FileInputStream(levelDat)) { root = LegacyNbt.readCompressed(input); } + Legacy112WorldMigrator.prepareWorld(levelDat.toPath(), root); + boolean changed = removeRetiredVanillaProfessionRegistry(root); changed |= removeObsoleteVanillaBiomeSnapshot(root); changed |= migrateRemovedVanillaBiomeSources(root); + preserveLegacySource(levelDat, root); if (changed) writeWithBackup(levelDat, root); } catch (IOException exception) { throw new IllegalStateException("Could not prepare the saved world metadata in " + levelDat, exception); } } + private static void preserveLegacySource(File levelDat, CompoundTag root) throws IOException { + CompoundTag data = root.getCompound("Data"); + if (!data.contains("DataVersion", Tag.TAG_ANY_NUMERIC) || data.getInt("DataVersion") >= 2834) return; + + Path sidecar = levelDat.toPath().resolveSibling(REGISTRY_SIDECAR); + if (Files.exists(sidecar)) return; + + // Remember the source version for chunks opened on a later visit. + // Player data belongs to this load only and is deliberately not saved here. + CompoundTag saved = new CompoundTag(); + CompoundTag source = new CompoundTag(); + source.putInt("DataVersion", data.getInt("DataVersion")); + saved.put("Data", source); + if (root.contains("FML", Tag.TAG_COMPOUND)) saved.put("FML", root.getCompound("FML").copy()); + + try (java.io.OutputStream output = Files.newOutputStream(sidecar, StandardOpenOption.CREATE_NEW)) { + LegacyNbt.writeCompressed(saved, output); + } + } + static boolean removeRetiredVanillaProfessionRegistry(CompoundTag root) { boolean changed = false; for (String namespace : new String[] {"fml", "FML"}) { @@ -657,13 +682,13 @@ private static void writeWithBackup(File file, CompoundTag data) throws IOExcept } private static File legacyRegistrySource(File levelDat) { - for (File candidate : new File[] { levelDat, new File(levelDat.getParentFile(), "level.dat_old"), - new File(levelDat.getParentFile(), REGISTRY_SIDECAR) }) { + for (File candidate : new File[] { levelDat, new File(levelDat.getParentFile(), REGISTRY_SIDECAR) }) { if (!candidate.isFile()) continue; try (FileInputStream input = new FileInputStream(candidate)) { CompoundTag root = LegacyNbt.readCompressed(input); if ((root.contains("FML", 10) && containsLegacyBaseMetalsRegistryEntry(root)) - || (root.contains("Data", 10) && root.getCompound("Data").getInt("DataVersion") < 2834)) return candidate; + || (root.getCompound("Data").contains("DataVersion", Tag.TAG_ANY_NUMERIC) + && root.getCompound("Data").getInt("DataVersion") < 2834)) return candidate; } catch (IOException ignored) {} } return null; diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java index f0d510ca4..a790ccd3d 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java @@ -4,7 +4,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import com.google.gson.JsonSyntaxException; -import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; @@ -46,12 +46,12 @@ private Shaped(ShapedRecipe plain) { } @Override - public boolean matches(CraftingContainer inventory, Level world) { + public boolean matches(CraftingInput inventory, Level world) { return allowed(this) && super.matches(inventory, world); } @Override - public ItemStack assemble(CraftingContainer inventory, net.minecraft.core.HolderLookup.Provider registries) { + public ItemStack assemble(CraftingInput inventory, net.minecraft.core.HolderLookup.Provider registries) { return allowed(this) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } @@ -75,12 +75,12 @@ private Shapeless(ShapelessRecipe plain) { } @Override - public boolean matches(CraftingContainer inventory, Level world) { + public boolean matches(CraftingInput inventory, Level world) { return allowed(this) && super.matches(inventory, world); } @Override - public ItemStack assemble(CraftingContainer inventory, net.minecraft.core.HolderLookup.Provider registries) { + public ItemStack assemble(CraftingInput inventory, net.minecraft.core.HolderLookup.Provider registries) { return allowed(this) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java index ba3062de5..8be81699d 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java @@ -11,7 +11,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; -import net.minecraft.world.Container; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; @@ -22,7 +22,7 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public final class CrushingRecipe implements Recipe { +public final class CrushingRecipe implements Recipe { public static final DeferredRegister> TYPES = DeferredRegister.create( net.minecraft.core.registries.Registries.RECIPE_TYPE, BaseMetals.MOD_ID); public static final DeferredRegister> SERIALIZERS = DeferredRegister.create( @@ -46,8 +46,15 @@ public CrushingRecipe(Ingredient ingredient, ItemStack result) { this.result = result.copy(); } - @Override public boolean matches(Container container, Level level) { return ingredient.test(container.getItem(0)); } - @Override public ItemStack assemble(Container container, net.minecraft.core.HolderLookup.Provider registries) { return result.copy(); } + @Override + public boolean matches(SingleRecipeInput input, Level level) { + return ingredient.test(input.item()); + } + + @Override + public ItemStack assemble(SingleRecipeInput input, net.minecraft.core.HolderLookup.Provider registries) { + return result.copy(); + } @Override public boolean canCraftInDimensions(int width, int height) { return width * height >= 1; } @Override public ItemStack getResultItem(net.minecraft.core.HolderLookup.Provider registries) { return result.copy(); } @Override public RecipeSerializer getSerializer() { return SERIALIZER.get(); } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java index 6c83cd59e..2d4ab74ea 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java @@ -16,9 +16,7 @@ import net.minecraft.world.item.crafting.SmeltingRecipe; /** - * Furnace recipe serializer which retains the counted outputs supported by the - * 1.12 furnace registry. Vanilla's 1.18 JSON serializer only accepts a result - * item ID and therefore cannot express the old multi-ingot recycling recipes. + * Keeps the existing recycling recipe IDs and counted furnace outputs. */ public final class LegacySmeltingRecipe extends SmeltingRecipe { public LegacySmeltingRecipe(String group, Ingredient ingredient, @@ -27,13 +25,13 @@ public LegacySmeltingRecipe(String group, Ingredient ingredient, } @Override - public boolean matches(net.minecraft.world.Container inventory, net.minecraft.world.level.Level world) { + public boolean matches(net.minecraft.world.item.crafting.SingleRecipeInput inventory, net.minecraft.world.level.Level world) { return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(getResultItem(world.registryAccess()).getItem()).toString()) && super.matches(inventory, world); } @Override - public ItemStack assemble(net.minecraft.world.Container inventory, net.minecraft.core.HolderLookup.Provider registries) { + public ItemStack assemble(net.minecraft.world.item.crafting.SingleRecipeInput inventory, net.minecraft.core.HolderLookup.Provider registries) { return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(getResultItem(registries).getItem()).toString()) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java index 9412a2d7e..b8324fa1a 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java @@ -12,7 +12,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; -import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -36,11 +36,11 @@ public PlateRepairRecipe(Item target, Ingredient plate) { } @Override - public boolean matches(CraftingContainer container, Level level) { + public boolean matches(CraftingInput container, Level level) { if (!zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(ForgeRegistries.ITEMS.getKey(target).toString())) return false; ItemStack foundTarget = ItemStack.EMPTY; boolean foundPlate = false; - for (int slot = 0; slot < container.getContainerSize(); slot++) { + for (int slot = 0; slot < container.size(); slot++) { ItemStack stack = container.getItem(slot); if (stack.isEmpty()) continue; if (stack.is(target) && stack.isDamaged() && foundTarget.isEmpty()) { @@ -55,9 +55,9 @@ public boolean matches(CraftingContainer container, Level level) { } @Override - public ItemStack assemble(CraftingContainer container, net.minecraft.core.HolderLookup.Provider registries) { + public ItemStack assemble(CraftingInput container, net.minecraft.core.HolderLookup.Provider registries) { if (!matches(container, null)) return ItemStack.EMPTY; - for (int slot = 0; slot < container.getContainerSize(); slot++) { + for (int slot = 0; slot < container.size(); slot++) { ItemStack stack = container.getItem(slot); if (stack.is(target) && stack.isDamaged()) { ItemStack repaired = stack.copy(); diff --git a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java index baf9a1464..417df93a5 100644 --- a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java +++ b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java @@ -30,7 +30,8 @@ public static void add(VillagerTradesEvent event) { int value = (int) (material.hardness() + material.strength() + material.magic() + material.toolLevel()); int emeraldCost = Math.max(1, (int) (0.2F * value)); int level = Math.max(1, Math.min(4, (int) (0.1F * value))); - Item ingot = ModContent.item(material.name() + "_ingot").get(); + Item ingot = material.name().equals("copper") + ? Items.COPPER_INGOT : ModContent.item(material.name() + "_ingot").get(); event.getTrades().get(level).add(selling(ingot, 12, emeraldCost)); if (!material.hasEquipment()) continue; if (event.getType() == VillagerProfession.ARMORER) { @@ -106,7 +107,10 @@ private static ItemListing selling(Item item, int count, int emeralds) { private static ItemListing enchanted(Item item, int baseCost) { return (trader, random) -> { int enchantmentLevel = 5 + random.nextInt(15); - ItemStack result = EnchantmentHelper.enchantItem(trader.level().enabledFeatures(), random, new ItemStack(item), enchantmentLevel, false); + ItemStack result = EnchantmentHelper.enchantItem(random, new ItemStack(item), enchantmentLevel, + trader.registryAccess(), java.util.Optional.of(trader.registryAccess() + .lookupOrThrow(net.minecraft.core.registries.Registries.ENCHANTMENT) + .getOrThrow(net.minecraft.tags.EnchantmentTags.ON_RANDOM_LOOT))); return new MerchantOffer(new net.minecraft.world.item.trading.ItemCost(Items.EMERALD, Math.min(64, baseCost + enchantmentLevel)), result, 3, 15, 0.2F); }; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index bdf5df472..614e28432 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -14,7 +14,7 @@ description='''${mod_description}''' [[dependencies.${mod_id}]] modId="orespawn" mandatory=true -versionRange="[4.1.0.120061,5.0.0)" +versionRange="[4.1.0.121011,5.0.0)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json b/src/main/resources/data/basemetals/tags/block/scythe_harvestable.json similarity index 100% rename from src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json rename to src/main/resources/data/basemetals/tags/block/scythe_harvestable.json diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index f000f6e7f..5cb9139dd 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "${mod_id} resources", - "pack_format": 32, - "supported_formats": {"min_inclusive": 32, "max_inclusive": 41} + "pack_format": 34, + "supported_formats": {"min_inclusive": 34, "max_inclusive": 48} } } diff --git a/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java b/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java index 1f8b22350..f7063c183 100644 --- a/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java +++ b/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.screens.DisconnectedScreen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -60,19 +59,11 @@ public static void tick(TickEvent.ClientTickEvent event) { } else { finish(minecraft, "connected"); } - } else if (minecraft.screen instanceof DisconnectedScreen) { - StringBuilder reason = new StringBuilder(); - try { - for (var field : DisconnectedScreen.class.getDeclaredFields()) { - if (!Component.class.isAssignableFrom(field.getType())) continue; - field.setAccessible(true); - reason.append(((Component) field.get(minecraft.screen)).getString()); - } - } catch (ReflectiveOperationException exception) { - throw new IllegalStateException("Could not inspect the disconnect screen", exception); - } - if (!reject || !reason.toString().contains("Base Metals") - || !reason.toString().contains("High Fantasy") || !reason.toString().contains("Low Fantasy")) { + } else if (minecraft.screen instanceof DisconnectedScreen disconnected) { + String reason = disconnected.getNarrationMessage().getString(); + + if (!reject || !reason.contains("Base Metals") + || !reason.contains("High Fantasy") || !reason.contains("Low Fantasy")) { throw new IllegalStateException("MODE_LOGIN_SMOKE FAIL: unexpected disconnect: " + reason); } finish(minecraft, "rejected"); diff --git a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml index c542d375a..c29d34d31 100644 --- a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml +++ b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml @@ -10,13 +10,13 @@ displayName="Base Metals packaged client smoke" [[dependencies.basemetals_client_smoke]] modId="basemetals" mandatory=true -versionRange="[3.1.0.120061]" +versionRange="[3.1.1.121011]" ordering="AFTER" side="CLIENT" [[dependencies.basemetals_client_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.120061]" +versionRange="[4.1.0.121011]" ordering="AFTER" side="CLIENT" diff --git a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java index 33e0d4574..ff7522606 100644 --- a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java +++ b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java @@ -38,7 +38,7 @@ public PackagedServerSmoke() { public void onServerStarted(ServerStartedEvent event) throws IOException { String baseMetals = version("basemetals"); String oreSpawn = version("orespawn"); - if (!"3.1.0.120061".equals(baseMetals) || !"4.1.0.120061".equals(oreSpawn)) { + if (!"3.1.1.121011".equals(baseMetals) || !"4.1.0.121011".equals(oreSpawn)) { throw new IllegalStateException("PACKAGED_SERVER_SMOKE FAIL versions basemetals=" + baseMetals + " orespawn=" + oreSpawn); } @@ -48,7 +48,7 @@ public void onServerStarted(ServerStartedEvent event) throws IOException { result.setProperty("basemetals", baseMetals); result.setProperty("orespawn", oreSpawn); result.setProperty("forge", version("forge")); - Path marker = event.getServer().getServerDirectory().toPath() + Path marker = event.getServer().getServerDirectory() .resolve("packaged-server-smoke-pass.properties"); try (var writer = Files.newBufferedWriter(marker, StandardCharsets.UTF_8)) { result.store(writer, "Base Metals packaged dedicated-server smoke"); @@ -81,7 +81,7 @@ private static void verifyContent(net.minecraft.server.MinecraftServer server) t if (burn != expected) throw new IllegalStateException(id + " has burn time " + burn + ", expected " + expected); } } - var bow = server.getRecipeManager().byKey(new net.minecraft.resources.ResourceLocation("basemetals:adamantine_bow")) + var bow = server.getRecipeManager().byKey(net.minecraft.resources.ResourceLocation.parse("basemetals:adamantine_bow")) .orElseThrow(); boolean enabled = !bow.value().isSpecial(); if (enabled != policy.allows("basemetals:adamantine_bow")) { @@ -96,7 +96,7 @@ private static void verifyContent(net.minecraft.server.MinecraftServer server) t private static void verifyIntegrationRecipes(net.minecraft.server.MinecraftServer server) throws IOException { var policy = zone.moddev.mc.basemetals.config.ContentPolicy.active(); int checked = 0; - for (var resource : server.getResourceManager().listResources("recipes/compat", id -> id.getPath().endsWith(".json")).keySet()) { + for (var resource : server.getResourceManager().listResources("recipe/compat", id -> id.getPath().endsWith(".json")).keySet()) { if (!resource.getNamespace().equals("basemetals")) continue; String path = resource.getPath(); String mod = path.contains("/thermal/") ? "thermal_expansion" @@ -112,8 +112,8 @@ private static void verifyIntegrationRecipes(net.minecraft.server.MinecraftServe if (!"basemetals:content_mode".equals(object.get("type").getAsString())) continue; enabled &= policy.allows(object.get("item").getAsString()); } - var id = new net.minecraft.resources.ResourceLocation("basemetals", - path.substring("recipes/".length(), path.length() - ".json".length())); + var id = net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("basemetals", + path.substring("recipe/".length(), path.length() - ".json".length())); if (server.getRecipeManager().byKey(id).isPresent() != enabled) { throw new IllegalStateException("Integration recipe does not follow content mode: " + id); } @@ -158,6 +158,6 @@ private static void verifyOreSample(net.minecraft.server.MinecraftServer server) } private static void verifyTinkers() { - throw new IllegalStateException("Tinkers has no supported Forge 1.20.6 release"); + throw new IllegalStateException("Tinkers integration is not enabled in this Forge 1.21.1 build"); } } diff --git a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml index c12c4d618..2b4aea8b7 100644 --- a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml +++ b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml @@ -10,13 +10,13 @@ displayName="Base Metals packaged server smoke" [[dependencies.basemetals_server_smoke]] modId="basemetals" mandatory=true -versionRange="[3.1.0.120061]" +versionRange="[3.1.1.121011]" ordering="AFTER" side="SERVER" [[dependencies.basemetals_server_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.120061]" +versionRange="[4.1.0.121011]" ordering="AFTER" side="SERVER" diff --git a/src/smoke/datapack/pack.mcmeta b/src/smoke/datapack/pack.mcmeta index 0faec4659..848430838 100644 --- a/src/smoke/datapack/pack.mcmeta +++ b/src/smoke/datapack/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 41, + "pack_format": 48, "description": "Base Metals custom ordinary dimension smoke fixture" } } diff --git a/src/test/java/zone/moddev/mc/basemetals/MechanicsContractTest.java b/src/test/java/zone/moddev/mc/basemetals/MechanicsContractTest.java index 97321d62a..de5ede19d 100644 --- a/src/test/java/zone/moddev/mc/basemetals/MechanicsContractTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/MechanicsContractTest.java @@ -20,7 +20,7 @@ void historicalAliasesResolveToTheirPreservedIds() { assertEquals("adamantine_door", MissingMappings.itemTargetPath("adamantine_door_item")); assertEquals("minecraft:iron_nugget", MissingMappings.itemTargetId("iron_nugget").toString()); assertEquals("mercury", MissingMappings.blockTargetPath( - new net.minecraft.resources.ResourceLocation("mmdlib", "liquid_mercury").getPath())); + net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("mmdlib", "liquid_mercury").getPath())); assertEquals("double_diamond_slab", MissingMappings.blockTargetPath("double_diamond_slab")); assertEquals("human_detector", MissingMappings.blockTargetPath("human_detector")); assertEquals("emerald_bow", MissingMappings.itemTargetPath("emerald_bow")); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java b/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java new file mode 100644 index 000000000..1eb2dccce --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java @@ -0,0 +1,84 @@ +package zone.moddev.mc.basemetals.data; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.nio.file.Files; +import java.nio.file.Path; +import org.junit.jupiter.api.Test; +import zone.moddev.mc.basemetals.compat.VanillaCopper; + +class CopperCompatibilityTest { + private static final Path DATA = Path.of("src/generated/resources/data/basemetals"); + + @Test + void overlappingCraftingRecipesProduceVanillaItems() throws Exception { + for (var entry : VanillaCopper.equivalents().entrySet()) { + String id = entry.getKey().substring("basemetals:".length()); + String recipeId = id.equals("copper_ingot") ? "copper_ingot_from_nuggets" : id; + + assertEquals(entry.getValue(), recipe(recipeId).getAsJsonObject("result") + .get("id").getAsString(), recipeId); + } + } + + @Test + void oldCopperItemsAndBlocksRemainRegistered() throws Exception { + var manifest = read(DATA.resolve("registry_manifest.json")); + + for (String item : VanillaCopper.equivalents().keySet()) { + assertTrue(manifest.getAsJsonArray("items").toString().contains('"' + item + '"'), item); + + if (!item.endsWith("_ingot")) { + assertTrue(manifest.getAsJsonArray("blocks").toString().contains('"' + item + '"'), item); + } + } + } + + @Test + void downstreamIngredientsAcceptOldAndVanillaCopper() throws Exception { + for (var entry : VanillaCopper.equivalents().entrySet()) { + String tag = VanillaCopper.ingredientTag(entry.getKey()).substring("forge:".length()); + var values = read(Path.of("src/generated/resources/data/forge/tags/item/" + tag + ".json")) + .getAsJsonArray("values").toString(); + + assertTrue(values.contains('"' + entry.getKey() + '"'), entry.getKey()); + assertTrue(values.contains('"' + entry.getValue() + '"'), entry.getValue()); + } + + assertEquals("forge:ingots/copper", recipe("copper_nuggets").getAsJsonArray("ingredients") + .get(0).getAsJsonObject().get("tag").getAsString()); + } + + @Test + void nativeTrapdoorsCannotBeRecycledAtTheOldHigherPrice() throws Exception { + var craft = recipe("copper_trapdoor"); + var nativeRecycle = recipe("vanilla_copper_trapdoor_recycling"); + var legacyRecycle = recipe("copper_trapdoor_recycling"); + int inputs = 0; + + for (var row : craft.getAsJsonArray("pattern")) { + inputs += row.getAsString().replace(" ", "").length(); + } + + assertEquals("minecraft:copper_trapdoor", nativeRecycle.getAsJsonObject("ingredient") + .get("item").getAsString()); + assertEquals(3, nativeRecycle.getAsJsonObject("result").get("count").getAsInt()); + assertEquals("basemetals:copper_trapdoor", legacyRecycle.getAsJsonObject("ingredient") + .get("item").getAsString()); + assertEquals(4, legacyRecycle.getAsJsonObject("result").get("count").getAsInt()); + assertTrue(nativeRecycle.getAsJsonObject("result").get("count").getAsInt() + * craft.getAsJsonObject("result").get("count").getAsInt() <= inputs); + } + + private static JsonObject recipe(String id) throws Exception { + JsonObject root = read(DATA.resolve("recipe/" + id + ".json")); + return root.has("recipe") ? root.getAsJsonObject("recipe") : root; + } + + private static JsonObject read(Path path) throws Exception { + return JsonParser.parseString(Files.readString(path)).getAsJsonObject(); + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java b/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java index b0103ddca..78a79082a 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java @@ -34,7 +34,7 @@ void rawMetalsHaveOnePowderProcessing() throws Exception { private static JsonObject recipe(String name) throws Exception { JsonObject json = JsonParser.parseString(Files.readString(Path.of( - "src/generated/resources/data/basemetals/recipes/" + name + ".json"))).getAsJsonObject(); + "src/generated/resources/data/basemetals/recipe/" + name + ".json"))).getAsJsonObject(); return json.has("recipe") ? json.getAsJsonObject("recipe") : json; } } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java b/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java index ec0657135..00251c5bd 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java @@ -15,7 +15,7 @@ class IntegrationContentPolicyTest { @Test void everyBundledMachineItemOutputHasAContentCondition() throws Exception { - Path recipes = Path.of("src/generated/resources/data/basemetals/recipes/compat"); + Path recipes = Path.of("src/generated/resources/data/basemetals/recipe/compat"); int count = 0; try (var paths = Files.walk(recipes)) { for (Path file : paths.filter(path -> path.toString().endsWith(".json")).toList()) { diff --git a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1206ResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java similarity index 55% rename from src/test/java/zone/moddev/mc/basemetals/data/Minecraft1206ResourceTest.java rename to src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java index 0623b6f46..cb78a6ecf 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1206ResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java @@ -12,19 +12,48 @@ import com.google.gson.JsonParser; import org.junit.jupiter.api.Test; -class Minecraft1206ResourceTest { +class Minecraft1211ResourceTest { @Test - void resourceAndDataPacksUseThe1206Formats() throws Exception { + void resourceAndDataPacksUseThe1211Formats() throws Exception { var pack = read("src/main/resources/pack.mcmeta").getAsJsonObject("pack"); - assertEquals(32, pack.get("pack_format").getAsInt()); + assertEquals(34, pack.get("pack_format").getAsInt()); var formats = pack.getAsJsonObject("supported_formats"); - assertEquals(32, formats.get("min_inclusive").getAsInt()); - assertEquals(41, formats.get("max_inclusive").getAsInt()); + assertEquals(34, formats.get("min_inclusive").getAsInt()); + assertEquals(48, formats.get("max_inclusive").getAsInt()); + } + + @Test + void dataRegistriesUseSingularDirectoryNames() throws Exception { + for (String source : new String[] {"src/main/resources/data", "src/generated/resources/data"}) { + try (var namespaces = Files.list(Path.of(source))) { + for (Path namespace : namespaces.filter(Files::isDirectory).toList()) { + for (String oldName : new String[] {"recipes", "loot_tables", "advancements", "structures"}) { + assertFalse(Files.exists(namespace.resolve(oldName)), namespace + "/" + oldName); + } + for (String oldName : new String[] {"items", "blocks", "fluids", "entity_types"}) { + assertFalse(Files.exists(namespace.resolve("tags/" + oldName)), namespace + "/tags/" + oldName); + } + } + } + } + } + + @Test + void silkTouchPredicatesUseTheEnchantmentSetField() throws Exception { + var loot = read("src/generated/resources/data/basemetals/loot_table/blocks/adamantine_ore.json"); + var silk = loot.getAsJsonArray("pools").get(0).getAsJsonObject().getAsJsonArray("entries").get(0) + .getAsJsonObject().getAsJsonArray("children").get(0).getAsJsonObject() + .getAsJsonArray("conditions").get(0).getAsJsonObject().getAsJsonObject("predicate") + .getAsJsonObject("predicates").getAsJsonArray("minecraft:enchantments").get(0).getAsJsonObject(); + + assertEquals("minecraft:silk_touch", silk.get("enchantments").getAsString()); + assertFalse(silk.has("enchantment")); + assertFalse(silk.has("predicates")); } @Test void scythesKeepTheirPlantAndCobwebHarvestingTag() throws Exception { - var values = read("src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json") + var values = read("src/main/resources/data/basemetals/tags/block/scythe_harvestable.json") .getAsJsonArray("values"); var blocks = new HashSet(); values.forEach(value -> blocks.add(value.getAsString())); @@ -36,7 +65,7 @@ void scythesKeepTheirPlantAndCobwebHarvestingTag() throws Exception { assertFalse(blocks.contains("minecraft:stone")); assertFalse(Files.exists(Path.of( - "src/generated/resources/data/basemetals/tags/blocks/scythe_harvestable.json"))); + "src/generated/resources/data/basemetals/tags/block/scythe_harvestable.json"))); } @Test @@ -51,7 +80,7 @@ void dormantTinkersStatsRetainTheirSourceFormat() throws Exception { @Test void enderIoUsesItsNativeRecipeAndOutputNames() throws Exception { - var recipe = read("src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json"); + var recipe = read("src/generated/resources/data/basemetals/recipe/compat/enderio/tin/ore_sag_milling.json"); assertEquals("enderio:sag_milling", recipe.get("type").getAsString()); var output = recipe.getAsJsonArray("outputs").get(0).getAsJsonObject(); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java index f86bd5775..39623bb65 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java @@ -23,21 +23,21 @@ class RawMaterialResourceTest { @Test void allRawMetalsHaveOneToOneProcessingAndDistinctTags() throws Exception { for (String metal : METALS) { - JsonObject crushing = read("data/basemetals/recipes/" + metal + "_raw_crushing.json"); + JsonObject crushing = read("data/basemetals/recipe/" + metal + "_raw_crushing.json"); assertEquals("basemetals:" + metal + "_powder", crushing.getAsJsonObject("result").get("id").getAsString()); assertEquals(1, (crushing.getAsJsonObject("result").has("count") ? crushing.getAsJsonObject("result").get("count").getAsInt() : 1)); for (String cooking : List.of("smelting", "blasting")) { - JsonObject recipe = read("data/basemetals/recipes/" + metal + "_raw_" + cooking + ".json"); + JsonObject recipe = read("data/basemetals/recipe/" + metal + "_raw_" + cooking + ".json"); assertEquals("basemetals:" + metal + "_ingot", recipe.getAsJsonObject("result").get("id").getAsString()); } - String rawTag = Files.readString(GENERATED.resolve("data/forge/tags/items/raw_materials/" + metal + ".json")); + String rawTag = Files.readString(GENERATED.resolve("data/forge/tags/item/raw_materials/" + metal + ".json")); assertTrue(rawTag.contains("basemetals:" + metal + "_raw")); - assertFalse(Files.readString(GENERATED.resolve("data/forge/tags/items/dusts/" + metal + ".json")).contains("_raw")); + assertFalse(Files.readString(GENERATED.resolve("data/forge/tags/item/dusts/" + metal + ".json")).contains("_raw")); } - try (Stream recipes = Files.list(GENERATED.resolve("data/basemetals/recipes"))) { + try (Stream recipes = Files.list(GENERATED.resolve("data/basemetals/recipe"))) { for (Path recipe : recipes.filter(file -> file.getFileName().toString().contains("blend")).toList()) { assertFalse(Files.readString(recipe).contains("raw_materials"), recipe.toString()); assertFalse(Files.readString(recipe).contains("_raw"), recipe.toString()); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java b/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java index 16d46af21..ced63a243 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java @@ -22,11 +22,11 @@ class RecipeRegressionTest { @Test void doorsAndTrapdoorsHaveDifferentPatterns() throws Exception { - try (Stream files = Files.list(DATA.resolve("recipes"))) { + try (Stream files = Files.list(DATA.resolve("recipe"))) { for (Path file : (Iterable) files.filter(path -> path.toString().endsWith("_door.json"))::iterator) { JsonObject door = read(file); String trapdoorName = file.getFileName().toString().replace("_door.json", "_trapdoor.json"); - JsonObject trapdoor = read(DATA.resolve("recipes").resolve(trapdoorName)); + JsonObject trapdoor = read(DATA.resolve("recipe").resolve(trapdoorName)); assertEquals(3, door.getAsJsonArray("pattern").size(), file.toString()); assertEquals(2, trapdoor.getAsJsonArray("pattern").size(), trapdoorName); @@ -37,17 +37,17 @@ void doorsAndTrapdoorsHaveDifferentPatterns() throws Exception { @Test void steelRailsGiveTheVanillaBatchSize() throws Exception { - JsonObject result = read(DATA.resolve("recipes/rail.json")).getAsJsonObject("result"); + JsonObject result = read(DATA.resolve("recipe/rail.json")).getAsJsonObject("result"); assertEquals(16, result.has("count") ? result.get("count").getAsInt() : 1); } @Test void craftingRecipesHaveIngredientBasedUnlocksButRepairsStayHidden() throws Exception { - try (Stream files = Files.list(DATA.resolve("recipes"))) { + try (Stream files = Files.list(DATA.resolve("recipe"))) { for (Path file : (Iterable) files.filter(Files::isRegularFile)::iterator) { JsonObject recipe = read(file); String type = recipe.get("type").getAsString(); - Path unlock = DATA.resolve("advancements/recipes").resolve(file.getFileName()); + Path unlock = DATA.resolve("advancement/recipes").resolve(file.getFileName()); if (type.startsWith("minecraft:crafting_")) { assertTrue(Files.isRegularFile(unlock), "Missing unlock for " + file); @@ -68,7 +68,7 @@ void everyCraftingRecipeHasThe112MaterialDiscoveryTrigger() throws Exception { Map discovery = materialDiscovery(); int tested = 0; - try (Stream files = Files.list(DATA.resolve("recipes"))) { + try (Stream files = Files.list(DATA.resolve("recipe"))) { for (Path file : (Iterable) files.filter(Files::isRegularFile)::iterator) { JsonObject recipe = read(file); if (!recipe.get("type").getAsString().startsWith("minecraft:crafting_")) continue; @@ -78,7 +78,7 @@ void everyCraftingRecipeHasThe112MaterialDiscoveryTrigger() throws Exception { ? "steel" : name.substring(0, name.indexOf('_')); assertTrue(discovery.containsKey(material), "Missing discovery material for " + name); - JsonObject advancement = read(DATA.resolve("advancements/recipes").resolve(file.getFileName())); + JsonObject advancement = read(DATA.resolve("advancement/recipes").resolve(file.getFileName())); JsonObject criteria = advancement.getAsJsonObject("criteria"); assertTrue(criteria.has("has_material"), "Missing material discovery for " + name); JsonObject acquired = criteria.getAsJsonObject("has_material"); @@ -103,7 +103,7 @@ void everyCraftingRecipeHasThe112MaterialDiscoveryTrigger() throws Exception { @Test void existing113RecipeAdvancementCriteriaRemainAvailable() throws Exception { - JsonObject criteria = read(DATA.resolve("advancements/recipes/adamantine_bow.json")) + JsonObject criteria = read(DATA.resolve("advancement/recipes/adamantine_bow.json")) .getAsJsonObject("criteria"); assertEquals("minecraft:recipe_unlocked", criteria.getAsJsonObject("has_recipe").get("trigger").getAsString()); assertEquals("#forge:rods/adamantine", criteria.getAsJsonObject("has_ingredient_1") @@ -112,25 +112,25 @@ void existing113RecipeAdvancementCriteriaRemainAvailable() throws Exception { @Test void obsidianCannotBeMultipliedThroughCrushingAndCompacting() throws Exception { - JsonObject block = read(DATA.resolve("recipes/obsidian_block.json")); + JsonObject block = read(DATA.resolve("recipe/obsidian_block.json")); int ingots = 0; for (com.google.gson.JsonElement row : block.getAsJsonArray("pattern")) { ingots += row.getAsString().replace(" ", "").length(); } - JsonObject crushing = read(DATA.resolve("recipes/obsidian_crushing.json")); + JsonObject crushing = read(DATA.resolve("recipe/obsidian_crushing.json")); assertTrue(ingots >= crushing.getAsJsonObject("result").get("count").getAsInt()); assertEquals("forge:ingots/obsidian", block.getAsJsonObject("key").getAsJsonObject("X") .get("tag").getAsString()); - assertEquals("basemetals:obsidian_ingot", read(DATA.resolve("recipes/obsidian_ingot.json")) + assertEquals("basemetals:obsidian_ingot", read(DATA.resolve("recipe/obsidian_ingot.json")) .getAsJsonObject("result").get("id").getAsString()); - assertFalse(block.get("pattern").equals(read(DATA.resolve("recipes/obsidian_bars.json")) + assertFalse(block.get("pattern").equals(read(DATA.resolve("recipe/obsidian_bars.json")) .get("pattern")), "Obsidian blocks must not collide with bars"); } @Test void craftingAndRecyclingCannotIncreaseTheSameMaterial() throws Exception { Map recipes = new LinkedHashMap(); - try (Stream files = Files.list(DATA.resolve("recipes"))) { + try (Stream files = Files.list(DATA.resolve("recipe"))) { for (Path file : (Iterable) files.filter(Files::isRegularFile)::iterator) { recipes.put(file.getFileName().toString(), read(file)); } @@ -142,6 +142,10 @@ void craftingAndRecyclingCannotIncreaseTheSameMaterial() throws Exception { JsonObject craft = recipes.get(entry.getKey().replace("_recycling", "")); if (craft == null || !craft.has("pattern")) continue; + JsonObject recyclingInput = entry.getValue().getAsJsonObject("ingredient"); + if (recyclingInput.has("item") && !recyclingInput.get("item").getAsString() + .equals(craft.getAsJsonObject("result").get("id").getAsString())) continue; + JsonObject result = entry.getValue().getAsJsonObject("result"); String output = result.get("id").getAsString().split(":")[1]; String material = output.contains("_") ? output.substring(0, output.indexOf('_')) : output; diff --git a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java index 2ad8c784a..d63572d90 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java @@ -65,7 +65,7 @@ void manifestHasModelsLootAndTranslationsForEveryRegisteredId() throws Exception assertResource("assets/basemetals/blockstates/" + id + ".json"); assertTrue(language.has("block.basemetals." + id), "Missing block translation for " + block); if (!fluids.contains(block)) { - assertResource("data/basemetals/loot_tables/blocks/" + id + ".json"); + assertResource("data/basemetals/loot_table/blocks/" + id + ".json"); } } for (String item : items) { @@ -268,9 +268,9 @@ void tagsRecipesLootAndProviderReferenceExistingBaseMetalsContent() throws Excep Set items = strings(manifest.getAsJsonArray("items")); Set fluids = strings(manifest.getAsJsonArray("fluids")); - validateTagTree(GENERATED.resolve("data"), "items", items); - validateTagTree(GENERATED.resolve("data"), "blocks", blocks); - validateTagTree(GENERATED.resolve("data"), "fluids", fluids); + validateTagTree(GENERATED.resolve("data"), "item", items); + validateTagTree(GENERATED.resolve("data"), "block", blocks); + validateTagTree(GENERATED.resolve("data"), "fluid", fluids); for (Path root : List.of(MAIN.resolve("data/basemetals"), GENERATED.resolve("data/basemetals"))) { if (!Files.isDirectory(root)) continue; @@ -296,7 +296,7 @@ void tagsRecipesLootAndProviderReferenceExistingBaseMetalsContent() throws Excep @Test void crushingAliasesAndOptionalProcessingContractsAreGenerated() throws Exception { - JsonObject crushing = read(resource("data/basemetals/recipes/copper_ore_crushing.json")).getAsJsonObject(); + JsonObject crushing = read(resource("data/basemetals/recipe/copper_ore_crushing.json")).getAsJsonObject(); assertEquals("basemetals:crushing", crushing.get("type").getAsString()); assertEquals("forge:ores/copper", crushing.getAsJsonObject("ingredient").get("tag").getAsString()); assertEquals(2, crushing.getAsJsonObject("result").get("count").getAsInt()); @@ -314,9 +314,9 @@ void crushingAliasesAndOptionalProcessingContractsAreGenerated() throws Exceptio assertCrushingRecipe("tin_nugget_crushing", "tag", "forge:nuggets/tin", "basemetals:tin_smallpowder", 1); - JsonObject adamantAlias = read(resource("data/forge/tags/items/ingots/adamantium.json")).getAsJsonObject(); + JsonObject adamantAlias = read(resource("data/forge/tags/item/ingots/adamantium.json")).getAsJsonObject(); assertTrue(strings(adamantAlias.getAsJsonArray("values")).contains("#forge:ingots/adamantine")); - JsonObject sprocket = read(resource("data/forge/tags/items/sprockets/steel.json")).getAsJsonObject(); + JsonObject sprocket = read(resource("data/forge/tags/item/sprockets/steel.json")).getAsJsonObject(); assertTrue(strings(sprocket.getAsJsonArray("values")).contains("#forge:gears/steel")); assertConditionalRecipe("compat/mekanism/adamantine/ore_to_dirty_slurry", "mekanism"); @@ -345,9 +345,9 @@ void legacyFurnaceConversionsAreGeneratedForEveryMaterialFamily() throws Excepti assertCookingRecipe("iron_crackhammer_recycling", "basemetals:legacy_smelting", "item", "basemetals:iron_crackhammer", "minecraft:iron_block", 1); - assertFalse(Files.exists(resource("data/basemetals/recipes/coal_powder_smelting.json")), + assertFalse(Files.exists(resource("data/basemetals/recipe/coal_powder_smelting.json")), "Coal powder must remain a fuel rather than smelting back into coal"); - assertFalse(Files.exists(resource("data/basemetals/recipes/charcoal_powder_smelting.json")), + assertFalse(Files.exists(resource("data/basemetals/recipe/charcoal_powder_smelting.json")), "Charcoal powder must remain a fuel rather than smelting back into charcoal"); JsonObject manifest = read(resource("data/basemetals/registry_manifest.json")).getAsJsonObject(); @@ -380,10 +380,10 @@ void legacyCraftingYieldsIngredientsAndAlternateRecipesAreRestored() throws Exce assertRecipeKeyTag("emerald_gear", "R", "forge:rods/iron"); assertRecipeKeyTag("stone_scythe", "X", "forge:stone"); assertRecipeKeyTag("copper_pickaxe", "X", "forge:ingots/copper"); - assertRecipeKeyItem("copper_block", "X", "basemetals:copper_ingot"); - assertRecipeIngredientItem("copper_block_ingot", "basemetals:copper_block"); + assertRecipeKeyTag("copper_block", "X", "forge:ingots/copper"); + assertRecipeIngredientTag("copper_block_ingot", "forge:storage_blocks/copper"); assertRecipeIngredientTag("tin_block_ingot", "forge:storage_blocks/tin"); - assertRecipeIngredientItem("copper_nuggets", "basemetals:copper_ingot"); + assertRecipeIngredientTag("copper_nuggets", "forge:ingots/copper"); assertRecipeKeyItem("copper_ingot_from_nuggets", "X", "basemetals:copper_nugget"); assertRecipeResult("iron_plate", "basemetals:iron_plate", 3); assertRecipeResult("gold_plate", "basemetals:gold_plate", 3); @@ -398,14 +398,14 @@ void legacyCraftingYieldsIngredientsAndAlternateRecipesAreRestored() throws Exce assertRecipeResult("quartz_nugget", "basemetals:quartz_nugget", 9); assertRecipeIngredientTag("quartz_nugget", "forge:gems/quartz"); assertRecipeResult("redstone_smallpowder", "basemetals:redstone_smallpowder", 9); - assertFalse(Files.exists(resource("data/basemetals/recipes/stone_gear.json"))); - assertFalse(Files.exists(resource("data/basemetals/recipes/wood_gear.json"))); - assertFalse(Files.exists(resource("data/basemetals/recipes/lapis_from_smallpowder.json"))); + assertFalse(Files.exists(resource("data/basemetals/recipe/stone_gear.json"))); + assertFalse(Files.exists(resource("data/basemetals/recipe/wood_gear.json"))); + assertFalse(Files.exists(resource("data/basemetals/recipe/lapis_from_smallpowder.json"))); } @Test void everyHistoricalPlateRepairRecipeUsesTheTypedSerializer() throws Exception { - Path recipes = GENERATED.resolve("data/basemetals/recipes"); + Path recipes = GENERATED.resolve("data/basemetals/recipe"); long count; try (Stream paths = Files.list(recipes)) { count = paths.filter(path -> path.getFileName().toString().endsWith("_plate_repair.json")).count(); @@ -426,24 +426,24 @@ void everyHistoricalPlateRepairRecipeUsesTheTypedSerializer() throws Exception { @Test void harvestAmmoAndWorldgenTagsCoverTheRestoredRuntimeContracts() throws Exception { - Set stone = strings(read(resource("data/minecraft/tags/blocks/needs_stone_tool.json")) + Set stone = strings(read(resource("data/minecraft/tags/block/needs_stone_tool.json")) .getAsJsonObject().getAsJsonArray("values")); - Set iron = strings(read(resource("data/minecraft/tags/blocks/needs_iron_tool.json")) + Set iron = strings(read(resource("data/minecraft/tags/block/needs_iron_tool.json")) .getAsJsonObject().getAsJsonArray("values")); - Set diamond = strings(read(resource("data/minecraft/tags/blocks/needs_diamond_tool.json")) + Set diamond = strings(read(resource("data/minecraft/tags/block/needs_diamond_tool.json")) .getAsJsonObject().getAsJsonArray("values")); assertTrue(stone.contains("basemetals:copper_ore")); assertTrue(iron.contains("basemetals:bronze_block")); assertTrue(diamond.contains("basemetals:adamantine_ore")); - Set beaconBases = strings(read(resource("data/minecraft/tags/blocks/beacon_base_blocks.json")) + Set beaconBases = strings(read(resource("data/minecraft/tags/block/beacon_base_blocks.json")) .getAsJsonObject().getAsJsonArray("values")); assertEquals(22, beaconBases.size()); assertTrue(beaconBases.contains("basemetals:adamantine_block")); assertTrue(beaconBases.contains("basemetals:charcoal_block")); assertFalse(beaconBases.contains("basemetals:mercury")); - Set arrows = strings(read(resource("data/minecraft/tags/items/arrows.json")) + Set arrows = strings(read(resource("data/minecraft/tags/item/arrows.json")) .getAsJsonObject().getAsJsonArray("values")); assertTrue(arrows.contains("basemetals:tin_arrow")); assertFalse(arrows.contains("basemetals:tin_bolt")); @@ -461,7 +461,7 @@ void harvestAmmoAndWorldgenTagsCoverTheRestoredRuntimeContracts() throws Excepti @Test void generatedHarvestTierTagsHaveDeterministicOrdering() throws Exception { for (String tier : List.of("stone", "iron", "diamond")) { - JsonArray values = read(resource("data/minecraft/tags/blocks/needs_" + tier + "_tool.json")) + JsonArray values = read(resource("data/minecraft/tags/block/needs_" + tier + "_tool.json")) .getAsJsonObject().getAsJsonArray("values"); List actual = new ArrayList<>(); values.forEach(value -> actual.add(value.getAsString())); @@ -482,7 +482,7 @@ void advancementsUseTheLegacyBehaviourTreeAndServerAwardCriterion() throws Excep Map.entry("demon_slayer", "minecraft:story/enter_the_nether"), Map.entry("juggernaut", "minecraft:story/enter_the_nether"), Map.entry("moon_boots", "minecraft:end/root")); - Path advancements = GENERATED.resolve("data/basemetals/advancements"); + Path advancements = GENERATED.resolve("data/basemetals/advancement"); long count; try (Stream paths = Files.list(advancements)) { count = paths.filter(path -> path.toString().endsWith(".json")).count(); @@ -513,9 +513,9 @@ void advancementsUseTheLegacyBehaviourTreeAndServerAwardCriterion() throws Excep @Test void customAnvilLootRetainsDamageWithoutUsingTheUnsafeVanillaTag() throws Exception { - assertFalse(Files.exists(GENERATED.resolve("data/minecraft/tags/blocks/anvil.json")), + assertFalse(Files.exists(GENERATED.resolve("data/minecraft/tags/block/anvil.json")), "Custom anvils trigger vanilla's hard-coded fall deletion when placed in minecraft:anvil"); - JsonObject loot = read(resource("data/basemetals/loot_tables/blocks/stone_anvil.json")) + JsonObject loot = read(resource("data/basemetals/loot_table/blocks/stone_anvil.json")) .getAsJsonObject(); JsonArray functions = loot.getAsJsonArray("pools").get(0).getAsJsonObject() .getAsJsonArray("entries").get(0).getAsJsonObject().getAsJsonArray("functions"); @@ -525,8 +525,8 @@ void customAnvilLootRetainsDamageWithoutUsingTheUnsafeVanillaTag() throws Except @Test void vanillaCrackhammerHeadsRetainTheirLegacyIngredients() throws Exception { - JsonObject stone = read(resource("data/basemetals/recipes/stone_crackhammer.json")).getAsJsonObject(); - JsonObject wood = read(resource("data/basemetals/recipes/wood_crackhammer.json")).getAsJsonObject(); + JsonObject stone = read(resource("data/basemetals/recipe/stone_crackhammer.json")).getAsJsonObject(); + JsonObject wood = read(resource("data/basemetals/recipe/wood_crackhammer.json")).getAsJsonObject(); assertEquals("minecraft:stone_bricks", stone.getAsJsonObject("key").getAsJsonObject("X").get("item").getAsString()); @@ -552,7 +552,7 @@ void chestInjectionTablesRetainEveryLegacyEntry() throws Exception { for (Map.Entry target : templates.entrySet()) { JsonObject legacy = read(Path.of("reference/1.12/alt/chests/" + target.getValue() + ".json")) .getAsJsonObject(); - JsonObject generated = read(resource("data/basemetals/loot_tables/chests/inject/" + JsonObject generated = read(resource("data/basemetals/loot_table/chests/inject/" + target.getKey() + ".json")).getAsJsonObject(); assertEquals(legacy.getAsJsonArray("pools").size(), generated.getAsJsonArray("pools").size(), target.getKey()); for (int pool = 0; pool < legacy.getAsJsonArray("pools").size(); pool++) { @@ -580,7 +580,8 @@ private static Set itemNames(JsonArray entries) { Set result = new LinkedHashSet<>(); entries.forEach(value -> { JsonObject entry = value.getAsJsonObject(); - if (entry.has("name")) result.add(entry.get("name").getAsString()); + if (entry.has("name")) result.add(zone.moddev.mc.basemetals.compat.VanillaCopper.output( + entry.get("name").getAsString())); }); return result; } @@ -603,7 +604,7 @@ private static void validateTagTree(Path dataRoot, String kind, Set regi } private static void assertConditionalRecipe(String id, String modId) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); JsonObject condition = recipe.getAsJsonObject("forge:condition").getAsJsonArray("values").get(0).getAsJsonObject(); assertEquals("forge:mod_loaded", condition.get("type").getAsString(), id); assertEquals(modId, condition.get("modid").getAsString(), id); @@ -611,7 +612,7 @@ private static void assertConditionalRecipe(String id, String modId) throws Exce private static void assertCrushingRecipe(String id, String ingredientKind, String ingredient, String result, int count) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); assertEquals("basemetals:crushing", recipe.get("type").getAsString(), id); assertEquals(ingredient, recipe.getAsJsonObject("ingredient").get(ingredientKind).getAsString(), id); assertEquals(result, recipe.getAsJsonObject("result").get("id").getAsString(), id); @@ -623,7 +624,7 @@ private static void assertCrushingRecipe(String id, String ingredientKind, Strin private static void assertCookingRecipe(String id, String type, String ingredientKind, String ingredient, String result, int count) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); assertEquals(type, recipe.get("type").getAsString(), id); assertEquals(ingredient, recipe.getAsJsonObject("ingredient").get(ingredientKind).getAsString(), id); JsonElement resultElement = recipe.get("result"); @@ -642,36 +643,36 @@ private static void assertCookingRecipe(String id, String type, String ingredien } private static void assertRecipeResult(String id, String item, int count) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); JsonObject result = recipe.getAsJsonObject("result"); assertEquals(item, result.get("id").getAsString(), id); assertEquals(count, result.has("count") ? result.get("count").getAsInt() : 1, id); } private static void assertRecipeKeyTag(String id, String key, String tag) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); assertEquals(tag, recipe.getAsJsonObject("key").getAsJsonObject(key).get("tag").getAsString(), id); } private static void assertRecipeKeyItem(String id, String key, String item) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); assertEquals(item, recipe.getAsJsonObject("key").getAsJsonObject(key).get("item").getAsString(), id); } private static void assertRecipeIngredientTag(String id, String tag) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); assertEquals(tag, recipe.getAsJsonArray("ingredients").get(0).getAsJsonObject() .get("tag").getAsString(), id); } private static void assertRecipeIngredientItem(String id, String item) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); assertEquals(item, recipe.getAsJsonArray("ingredients").get(0).getAsJsonObject() .get("item").getAsString(), id); } private static void assertRecipePattern(String id, String... rows) throws Exception { - JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); + JsonObject recipe = read(resource("data/basemetals/recipe/" + id + ".json")).getAsJsonObject(); List actual = new ArrayList<>(); recipe.getAsJsonArray("pattern").forEach(row -> actual.add(row.getAsString())); assertEquals(List.of(rows), actual, id); diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java new file mode 100644 index 000000000..6a88ed8f5 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java @@ -0,0 +1,495 @@ +package zone.moddev.mc.basemetals.migration; + +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Reader; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collections; +import java.util.zip.DeflaterOutputStream; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; +import java.util.zip.InflaterInputStream; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.NbtIo; +import net.minecraft.SharedConstants; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.chunk.storage.RegionStorageInfo; +import net.minecraft.world.level.chunk.storage.RegionFile; +import net.minecraft.world.level.chunk.storage.RegionFileVersion; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.CleanupMode; +import org.junit.jupiter.api.io.TempDir; + +/** Checks the migration boundary without opening a player's save. */ +class LegacyMigrationSafetyTest { + @TempDir(cleanup = CleanupMode.ON_SUCCESS) + Path temporaryWorld; + + private static final String MARKER = "BASEMETALS_1_12_BLOCK_MIGRATION_COMPLETE.txt"; + private static final String VERSION = minecraftVersion(); + private static final int DATA_VERSION = dataVersion(); + + @BeforeAll + static void gameVersion() { + SharedConstants.tryDetectVersion(); + } + + @Test + void modernDeflateWorld() throws Exception { + Path world = world("deflate", false); + Path region = region(world, false, false); + assertTrue(nativeAccepts(region, false)); + byte[] before = Files.readAllBytes(region); + + runEntry(world); + + assertArrayEquals(before, Files.readAllBytes(region)); + assertFalse(Files.exists(world.resolve(MARKER))); + } + + @Test + void modernEmptyRegion() throws Exception { + Path world = world("empty", false); + Path file = world.resolve("region/r.0.0.mca"); + Files.createDirectories(file.getParent()); + Files.createFile(file); + assertTrue(nativeAccepts(file, true)); + long nativeLength = Files.size(file); + + runEntry(world); + + assertEquals(nativeLength, Files.size(file)); + assertFalse(Files.exists(world.resolve(MARKER))); + } + + @Test + void modernExternalChunk() throws Exception { + Path world = world("external", false); + Path file = region(world, true, false); + boolean nativeAccepted = nativeAccepts(file, false); + byte[] before = Files.readAllBytes(file); + assertTrue(nativeAccepted); + runEntry(world); + assertFalse(Files.exists(world.resolve(MARKER))); + assertArrayEquals(before, Files.readAllBytes(file)); + } + + @Test + void modernLz4Chunk() throws Exception { + assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.1"), "Native LZ4 is not available on older targets"); + Path world = world("lz4", false); + Path file = region(world, false, true); + assertTrue(nativeAccepts(file, false)); + byte[] before = Files.readAllBytes(file); + runEntry(world); + assertFalse(Files.exists(world.resolve(MARKER))); + assertArrayEquals(before, Files.readAllBytes(file)); + + } + + @Test + void stalePreFlatteningBackupWithNoLegacyChunks() throws Exception { + Path world = world("stale-backup", true); + writeLevel(world.resolve("level.dat_old"), 1343, true, 3); + byte[] before = Files.readAllBytes(world.resolve("level.dat")); + runEntry(world); + int experience = experience(world.resolve("level.dat")); + assertEquals(37, experience); + assertArrayEquals(before, Files.readAllBytes(world.resolve("level.dat"))); + assertFalse(Files.exists(world.resolve(MARKER))); + } + + @Test + void ordinaryModernBackupDoesNotReplacePlayer() throws Exception { + Path world = world("modern-backup", true); + writeLevel(world.resolve("level.dat_old"), DATA_VERSION, true, 3); + runEntry(world); + assertEquals(37, experience(world.resolve("level.dat"))); + } + + @Test + void existingCompletionMarkerSkipsScanner() throws Exception { + Path world = world("already-marked", true); + writeLevel(world.resolve("level.dat_old"), 1343, true, 3); + Path file = world.resolve("region/r.0.0.mca"); + Files.createDirectories(file.getParent()); + Files.createFile(file); + Files.write(world.resolve(MARKER), Collections.singletonList("Existing marker")); + runEntry(world); + assertEquals(37, experience(world.resolve("level.dat"))); + } + + @Test + void savedRegistryDoesNotMakeAnOldBackupTheCurrentPlayer() throws Exception { + Path world = world("saved-registry", true); + writeLevel(world.resolve("level.dat_old"), 1343, true, 3); + writeRegistry(world.resolve("basemetals-legacy-registry.dat")); + Path region = region(world, true, false); + byte[] regionBefore = Files.readAllBytes(region); + byte[] playerBefore = Files.readAllBytes(world.resolve("level.dat")); + byte[] externalBefore = Files.readAllBytes(region.getParent().resolve("c.0.0.mcc")); + + runEntry(world); + + assertTrue(Files.exists(world.resolve(MARKER))); + assertArrayEquals(regionBefore, Files.readAllBytes(region)); + assertArrayEquals(externalBefore, Files.readAllBytes(region.getParent().resolve("c.0.0.mcc"))); + assertArrayEquals(playerBefore, Files.readAllBytes(world.resolve("level.dat"))); + } + + @Test + void savedRegistryCanBeScannedWithAnEmptyRegion() throws Exception { + Path world = world("saved-registry-empty", false); + writeRegistry(world.resolve("basemetals-legacy-registry.dat")); + Path file = world.resolve("region/r.0.0.mca"); + Files.createDirectories(file.getParent()); + Files.createFile(file); + + runEntry(world); + + assertEquals(0, Files.size(file)); + assertTrue(Files.exists(world.resolve(MARKER))); + } + + @Test + void savedRegistryCanBeScannedWithLz4Chunks() throws Exception { + assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.1")); + Path world = world("saved-registry-lz4", false); + writeRegistry(world.resolve("basemetals-legacy-registry.dat")); + Path file = region(world, false, true); + byte[] before = Files.readAllBytes(file); + + runEntry(world); + + assertArrayEquals(before, Files.readAllBytes(file)); + assertTrue(Files.exists(world.resolve(MARKER))); + } + + @Test + void firstUpgradeUsesThePlayerCapturedBeforeForgeReadsTheWorld() throws Exception { + Path world = world("first-legacy-upgrade", true); + writeLevel(world.resolve("level.dat"), 1343, true, 7); + LegacyWorldDataHook.prepareLegacyWorld(world.resolve("level.dat").toFile()); + + // Forge has now rewritten level.dat. Its backup is not our source of player data. + writeLevel(world.resolve("level.dat"), DATA_VERSION, true, 37); + writeLevel(world.resolve("level.dat_old"), 1343, true, 3); + runEntry(world); + + assertEquals(7, experience(world.resolve("level.dat"))); + assertTrue(Files.exists(world.resolve("basemetals-1.12-region-backup/level.dat"))); + assertTrue(Files.exists(world.resolve(MARKER))); + + writeLevel(world.resolve("level.dat"), DATA_VERSION, true, 38); + LegacyWorldDataHook.prepareLegacyWorld(world.resolve("level.dat").toFile()); + runEntry(world); + assertEquals(38, experience(world.resolve("level.dat"))); + } + + @Test + void openingAnotherWorldClearsTheCapturedPlayer() throws Exception { + Path oldWorld = world("old-world", true); + writeLevel(oldWorld.resolve("level.dat"), 1343, true, 7); + LegacyWorldDataHook.prepareLegacyWorld(oldWorld.resolve("level.dat").toFile()); + + Path modernWorld = world("next-modern-world", true); + LegacyWorldDataHook.prepareLegacyWorld(modernWorld.resolve("level.dat").toFile()); + writeLevel(modernWorld.resolve("level.dat_old"), 1343, true, 3); + runEntry(modernWorld); + + assertEquals(37, experience(modernWorld.resolve("level.dat"))); + assertFalse(Files.exists(modernWorld.resolve(MARKER))); + } + + @Test + void anOldBackupDoesNotActivateTerrainProtectionInAModernWorld() throws Exception { + for (int backupVersion : new int[] {1343, 2730}) { + Path world = world("old-terrain-backup", true); + writeLevel(world.resolve("level.dat_old"), backupVersion, true, 3); + region(world, false, false); + + LegacyWorldDataHook.prepareLegacyWorld(world.resolve("level.dat").toFile()); + + Field active = LegacyWorldDataHook.class.getDeclaredField("legacyWorldActive"); + active.setAccessible(true); + assertFalse(active.getBoolean(null), "Backup version " + backupVersion); + assertEquals(37, experience(world.resolve("level.dat"))); + } + } + + @Test + void terrainProtectionSurvivesReloadWithoutTrustingAnOldBackup() throws Exception { + Path world = world("flattened-upgrade", false); + writeLevel(world.resolve("level.dat"), 2730, false, 0); + region(world, false, false); + LegacyWorldDataHook.prepareLegacyWorld(world.resolve("level.dat").toFile()); + + assertTrue(Files.exists(world.resolve("basemetals-legacy-registry.dat"))); + writeLevel(world.resolve("level.dat"), DATA_VERSION, false, 0); + LegacyWorldDataHook.prepareLegacyWorld(world.resolve("level.dat").toFile()); + + Field active = LegacyWorldDataHook.class.getDeclaredField("legacyWorldActive"); + active.setAccessible(true); + assertTrue(active.getBoolean(null)); + runEntry(world); + assertFalse(Files.exists(world.resolve(MARKER))); + } + + @Test + void mixedRegionsAndLaterOpenedCustomDimensionChunksKeepTheirContents() throws Exception { + Path world = world("mixed-legacy-chunks", true); + writeRegistry(world.resolve("basemetals-legacy-registry.dat")); + writeLevel(world.resolve("level.dat_old"), 1343, true, 3); + Path mixed = region(world, true, false); + Path external = mixed.getParent().resolve("c.0.0.mcc"); + byte[] externalBefore = Files.readAllBytes(external); + appendLegacyChunk(mixed, 1, 1); + byte[] mixedBefore = Files.readAllBytes(mixed); + + Path later = world.resolve("dimensions/example/nested/cavern/region/r.2.0.mca"); + Files.createDirectories(later.getParent()); + Files.write(later, new byte[8192]); + appendLegacyChunk(later, 0, 64); + + runEntry(world); + + for (Path file : Arrays.asList(mixed, later)) { + int index = file.equals(mixed) ? 1 : 0; + CompoundTag chunk = readRegionChunk(file, index); + assertEquals(1456, chunk.getInt("DataVersion")); + assertEquals("example:legacy_block", + Legacy112WorldMigrator.stateAtForTest(chunk, 0, 0).getString("Name")); + assertTrue(Files.exists(world.resolve("basemetals-1.12-region-backup").resolve(world.relativize(file)))); + } + assertEquals(37, experience(world.resolve("level.dat"))); + assertArrayEquals(externalBefore, Files.readAllBytes(external)); + assertArrayEquals(externalBefore, Files.readAllBytes( + world.resolve("basemetals-1.12-region-backup/region/c.0.0.mcc"))); + assertArrayEquals(mixedBefore, Files.readAllBytes( + world.resolve("basemetals-1.12-region-backup/region/r.0.0.mca"))); + assertTrue(nativeAccepts(mixed, false)); + + byte[] mixedAfter = Files.readAllBytes(mixed); + byte[] laterAfter = Files.readAllBytes(later); + runEntry(world); + assertArrayEquals(mixedAfter, Files.readAllBytes(mixed)); + assertArrayEquals(laterAfter, Files.readAllBytes(later)); + } + + private static void appendLegacyChunk(Path file, int index, int chunkX) throws Exception { + CompoundTag chunk = new CompoundTag(); + chunk.putInt("DataVersion", 1343); + CompoundTag level = new CompoundTag(); + level.putInt("xPos", chunkX); + level.putInt("zPos", 0); + level.putBoolean("TerrainPopulated", true); + level.putBoolean("LightPopulated", true); + level.put("Entities", new ListTag()); + level.put("TileEntities", new ListTag()); + level.putByteArray("Biomes", new byte[256]); + level.putIntArray("HeightMap", new int[256]); + CompoundTag section = new CompoundTag(); + section.putByte("Y", (byte) 0); + byte[] blocks = new byte[4096]; + blocks[0] = (byte) 200; + section.putByteArray("Blocks", blocks); + section.putByteArray("Data", new byte[2048]); + ListTag sections = new ListTag(); + sections.add(section); + level.put("Sections", sections); + chunk.put("Level", level); + + ByteArrayOutputStream compressed = new ByteArrayOutputStream(); + try (DataOutputStream output = new DataOutputStream(new DeflaterOutputStream(compressed))) { + NbtIo.write(chunk, output); + } + byte[] payload = compressed.toByteArray(); + byte[] original = Files.readAllBytes(file); + int offset = (original.length + 4095) / 4096; + int sectors = (payload.length + 5 + 4095) / 4096; + ByteBuffer result = ByteBuffer.wrap(Arrays.copyOf(original, (offset + sectors) * 4096)); + result.putInt(index * 4, (offset << 8) | sectors); + result.position(offset * 4096); + result.putInt(payload.length + 1); + result.put((byte) 2); + result.put(payload); + Files.write(file, result.array()); + } + + private static CompoundTag readRegionChunk(Path file, int index) throws Exception { + byte[] contents = Files.readAllBytes(file); + ByteBuffer header = ByteBuffer.wrap(contents); + int offset = (header.getInt(index * 4) >>> 8) * 4096; + int length = header.getInt(offset); + assertEquals(2, contents[offset + 4]); + try (DataInputStream input = new DataInputStream(new InflaterInputStream( + new ByteArrayInputStream(contents, offset + 5, length - 1)))) { + return (CompoundTag) readNbt(input); + } + } + + private static void writeRegistry(Path file) throws IOException { + try (DataOutputStream output = new DataOutputStream(new GZIPOutputStream(Files.newOutputStream(file)))) { + output.writeByte(10); + output.writeUTF(""); + output.writeByte(10); + output.writeUTF("Data"); + integer(output, "DataVersion", 2730); + output.writeByte(0); + for (String name : Arrays.asList("FML", "Registries", "minecraft:blocks")) { + output.writeByte(10); + output.writeUTF(name); + } + output.writeByte(9); + output.writeUTF("ids"); + output.writeByte(10); + output.writeInt(3); + integer(output, "V", 0); + output.writeByte(8); + output.writeUTF("K"); + output.writeUTF("minecraft:air"); + output.writeByte(0); + integer(output, "V", 300); + output.writeByte(8); + output.writeUTF("K"); + output.writeUTF("basemetals:copper_ore"); + output.writeByte(0); + integer(output, "V", 200); + output.writeByte(8); + output.writeUTF("K"); + output.writeUTF("example:legacy_block"); + output.writeByte(0); + for (int end = 0; end < 4; end++) output.writeByte(0); + } + } + + private static void runEntry(Path world) throws IOException { + Legacy112WorldMigrator.migrateIfNeeded(world); + } + + private static com.google.gson.JsonObject versionInformation() { + try (InputStream input = LegacyMigrationSafetyTest.class.getResourceAsStream("/version.json"); + Reader reader = new InputStreamReader(input, java.nio.charset.StandardCharsets.UTF_8)) { + return com.google.gson.JsonParser.parseReader(reader).getAsJsonObject(); + } catch (IOException failure) { + throw new IllegalStateException(failure); + } + } + + private static String minecraftVersion() { + return versionInformation().get("id").getAsString(); + } + + private static int dataVersion() { + return versionInformation().get("world_version").getAsInt(); + } + + private Path world(String name, boolean player) throws Exception { + Path world = Files.createTempDirectory(temporaryWorld, name + "-"); + writeLevel(world.resolve("level.dat"), DATA_VERSION, player, 37); + return world; + } + + private static void writeLevel(Path file, int version, boolean player, int xp) throws IOException { + try (DataOutputStream output = new DataOutputStream(new GZIPOutputStream(Files.newOutputStream(file)))) { + output.writeByte(10); + output.writeUTF(""); + output.writeByte(10); + output.writeUTF("Data"); + integer(output, "DataVersion", version); + if (player) { + output.writeByte(10); + output.writeUTF("Player"); + integer(output, "XpLevel", xp); + for (String name : Arrays.asList("Inventory", "EnderItems")) { + output.writeByte(9); + output.writeUTF(name); + output.writeByte(10); + output.writeInt(0); + } + output.writeByte(0); + } + output.writeByte(0); + output.writeByte(0); + } + } + + private static void integer(DataOutputStream output, String key, int value) throws IOException { + output.writeByte(3); + output.writeUTF(key); + output.writeInt(value); + } + + private static int experience(Path file) throws IOException { + try (DataInputStream input = new DataInputStream(new GZIPInputStream(Files.newInputStream(file)))) { + return NbtIo.read(input).getCompound("Data").getCompound("Player").getInt("XpLevel"); + } + } + + private static CompoundTag readNbt(DataInputStream input) throws IOException { + return NbtIo.read(input); + } + + private static Path region(Path world, boolean external, boolean lz4) throws Exception { + ByteArrayOutputStream compressed = new ByteArrayOutputStream(); + OutputStream compressor = new DeflaterOutputStream(compressed); + if (lz4) { + RegionFileVersion version = (RegionFileVersion) RegionFileVersion.class.getField("VERSION_LZ4").get(null); + compressor = version.wrap(compressed); + } + try (DataOutputStream output = new DataOutputStream(compressor)) { + output.writeByte(10); + output.writeUTF(""); + integer(output, "DataVersion", DATA_VERSION); + integer(output, "xPos", 0); + integer(output, "zPos", 0); + output.writeByte(0); + } + byte[] payload = external ? new byte[0] : compressed.toByteArray(); + int sectors = (payload.length + 5 + 4095) / 4096; + ByteBuffer buffer = ByteBuffer.allocate(8192 + sectors * 4096); + buffer.putInt((2 << 8) | sectors); + buffer.position(8192); + buffer.putInt(payload.length + 1); + buffer.put((byte) ((lz4 ? 4 : 2) | (external ? 128 : 0))); + buffer.put(payload); + Path file = world.resolve("region/r.0.0.mca"); + Files.createDirectories(file.getParent()); + Files.write(file, buffer.array()); + if (external) Files.write(file.getParent().resolve("c.0.0.mcc"), compressed.toByteArray()); + return file; + } + + private static boolean nativeAccepts(Path file, boolean empty) throws IOException { + try (RegionFile region = new RegionFile(new RegionStorageInfo("Base Metals test", Level.OVERWORLD, "chunk"), + file, file.getParent(), false); + DataInputStream input = region.getChunkDataInputStream(new ChunkPos(0, 0))) { + if (empty) { + assertNull(input); + return true; + } + + assertNotNull(input); + assertEquals(DATA_VERSION, NbtIo.read(input).getInt("DataVersion")); + return true; + } + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java b/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java index 7f2a9a39d..9f53f7b0d 100644 --- a/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java @@ -5,7 +5,7 @@ import java.nio.file.Path; import org.junit.jupiter.api.Test; -/** Forge 50 owns protocol transitions; Base Metals only checks its own content mode. */ +/** Forge owns protocol transitions; Base Metals only checks its own content mode. */ class ConnectionReadInterestTest { @Test void obsoleteConnectionPatchIsNotInstalled() throws Exception { diff --git a/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java b/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java index 63f019564..0078e38cd 100644 --- a/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java +++ b/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java @@ -121,6 +121,8 @@ public static void onServerStarted(ServerStartedEvent event) { } ServerLevel overworld = event.getServer().overworld(); + var unbreaking = overworld.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.ENCHANTMENT) + .getOrThrow(Enchantments.UNBREAKING); for (JsonElement itemElement : manifest.getAsJsonArray("items")) { JsonObject oldItem = itemElement.getAsJsonObject(); int chestIndex = oldItem.get("chest").getAsInt(); @@ -144,7 +146,7 @@ public static void onServerStarted(ServerStartedEvent event) { net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompound("basemetals_fixture") .getString("proof").equals(oldItem.get("id").getAsString()); boolean enchantmentMatches = !oldItem.has("enchanted") || !oldItem.get("enchanted").getAsBoolean() - || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, stack) == 2; + || EnchantmentHelper.getItemEnchantmentLevel(unbreaking, stack) == 2; if (!expected.equals(actual) || stack.getCount() != expectedCount || stack.getDamageValue() != expectedDamage || !proofMatches || !enchantmentMatches) { if (itemMismatches < 10) { @@ -153,7 +155,7 @@ public static void onServerStarted(ServerStartedEvent event) { + " with fixture NBT but found " + stack + " damage=" + stack.getDamageValue() + " proof=" + proofMatches + " unbreaking=" - + EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, stack)); + + EnchantmentHelper.getItemEnchantmentLevel(unbreaking, stack)); } itemMismatches++; } @@ -174,7 +176,7 @@ public static void onServerStarted(ServerStartedEvent event) { && worn.getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompound("basemetals_fixture").getString("proof") .equals(oldItem.get("id").getAsString()) - && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, worn) == 2; + && EnchantmentHelper.getItemEnchantmentLevel(unbreaking, worn) == 2; }); if (!equipped) { if (itemMismatches < 10) failures.add("missing armor-stand equipment " + expected); diff --git a/tools/validation/README.md b/tools/validation/README.md index 1e4b4f8ff..13982d99c 100644 --- a/tools/validation/README.md +++ b/tools/validation/README.md @@ -1,6 +1,6 @@ # World upgrade checks -`test_legacy_worlds.js` starts the packaged Forge 1.20.6 server against a fresh +`test_legacy_worlds.js` starts the packaged Forge 1.21.1 server against a fresh copy of each supplied world, then starts it again to check the saved result. It refuses to overwrite an existing test directory and fingerprints every source world before and after the test. @@ -19,6 +19,10 @@ unopened through the first load and reload, then check them on a third start. `oreOverrides` edits named Base Metals rules in the disposable world's saved OreSpawn profile and verifies that those values survive both starts. +The log check accepts known vanilla registry changes, including paintings moved +to data files. Unknown or modded entries still fail the test. Check that boundary +with `node --test tools/validation/test_painting_registry.js`. + `compare_world_terrain.py` checks fixed vanilla terrain before and after conversion. It accepts Minecraft's new underground floor and accounts for normal falling sand and gravel, but rejects ore replacing existing rock. diff --git a/tools/validation/painting_registry.js b/tools/validation/painting_registry.js new file mode 100644 index 000000000..b08f715d2 --- /dev/null +++ b/tools/validation/painting_registry.js @@ -0,0 +1,15 @@ +// These old Forge snapshot entries are now supplied by vanilla's painting data. +const paintings = new Set([ + 'alban', 'aztec', 'aztec2', 'bomb', 'burning_skull', 'bust', 'courbet', 'creebet', + 'donkey_kong', 'earth', 'fighters', 'fire', 'graham', 'kebab', 'match', 'pigscene', + 'plant', 'pointer', 'pool', 'sea', 'skeleton', 'skull_and_roses', 'stage', 'sunset', + 'void', 'wanderer', 'wasteland', 'water', 'wind', 'wither' +].map(name => 'minecraft:' + name)); + +function isVanillaPaintingSnapshot(registry, entries) { + return registry === 'minecraft:painting_variant' + && entries.length > 0 + && entries.every(entry => paintings.has(entry)); +} + +module.exports = { isVanillaPaintingSnapshot }; diff --git a/tools/validation/test_content_modes.js b/tools/validation/test_content_modes.js index 9f528766f..cfb21ff78 100644 --- a/tools/validation/test_content_modes.js +++ b/tools/validation/test_content_modes.js @@ -94,7 +94,7 @@ function verifyConfig(directory, initial) { (async () => { const results = []; - const client = clientLaunch(spec.clientRuntime, '1.20.6', '50.2.0'); + const client = clientLaunch(spec.clientRuntime, '1.21.1', '52.1.0'); const selected = spec.cases ? cases.filter(([name]) => spec.cases.includes(name)) : cases; if (!selected.length || (spec.cases && selected.length !== spec.cases.length)) { throw new Error('The requested mode-test case is unknown or duplicated.'); @@ -114,14 +114,14 @@ function verifyConfig(directory, initial) { + 'generator-settings={"layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:dirt","height":2},{"block":"minecraft:grass_block","height":1}],"biome":"minecraft:plains"}\n' + 'generate-structures=false\nmax-tick-time=-1\n'); const server = launch(serverDir, ['-Xms256m', '-Xmx2g', '-Dbasemetals.awaitLoginSmoke=true', - ...serverArguments(spec.serverRuntime, serverDir, '1.20.6', '50.2.0')], 'server.log'); + ...serverArguments(spec.serverRuntime, serverDir, '1.21.1', '52.1.0')], 'server.log'); let player; try { await waitFor(server, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', 240000); player = launch(clientDir, ['-Xms512m', '-Xmx2g', '-Dbasemetals.remoteLoginSmoke=true', `-Dbasemetals.remoteAddress=127.0.0.1:${port}`, `-Dbasemetals.loginSmokeConnections=${reject ? 1 : 3}`, `-Dbasemetals.expectModeReject=${!!reject}`, ...client.args, ...client.metadata.arguments.game, - '--username', 'BMValidation', '--version', '1.20.6', '--gameDir', clientDir, + '--username', 'BMValidation', '--version', '1.21.1', '--gameDir', clientDir, '--assetsDir', path.join(spec.clientRuntime, 'assets'), '--assetIndex', client.vanilla.assetIndex.id, '--uuid', '00000000000000000000000000000118', '--accessToken', '0', '--userType', 'legacy'], 'client.log'); await waitFor(player, 'BASEMETALS_MODE_LOGIN_CLIENT PASS result=' + (reject ? 'rejected' : 'connected'), 240000); diff --git a/tools/validation/test_legacy_worlds.js b/tools/validation/test_legacy_worlds.js index 91bd997c9..24f7f7168 100644 --- a/tools/validation/test_legacy_worlds.js +++ b/tools/validation/test_legacy_worlds.js @@ -4,6 +4,7 @@ const path = require('path'); const crypto = require('crypto'); const { spawn } = require('child_process'); const { serverArguments } = require('./forge_launcher'); +const { isVanillaPaintingSnapshot } = require('./painting_registry'); const spec = JSON.parse(fs.readFileSync(process.argv[2], 'utf8')); const phase = process.argv[3] || 'upgrade'; @@ -110,7 +111,17 @@ function checkUpgradeLog(log) { entries.push(entry[1]); } - if (entries.length && entries.every(entry => retiredVanillaEntries.has(entry))) { + const registry = line.slice(line.indexOf('Unidentified mapping from registry ') + + 'Unidentified mapping from registry '.length).trim(); + const knownPaintingSnapshot = isVanillaPaintingSnapshot(registry, entries); + const renamedTrialSpawnerSounds = registry === 'minecraft:sound_event' + && entries.length > 0 && entries.every(entry => [ + 'minecraft:block.trial_spawner.ambient_charged', + 'minecraft:block.trial_spawner.charge_activate' + ].includes(entry)); + + if (knownPaintingSnapshot || renamedTrialSpawnerSounds + || entries.length && entries.every(entry => retiredVanillaEntries.has(entry))) { entries.forEach(entry => acceptedEntries.add(entry)); continue; } @@ -132,7 +143,7 @@ async function run(directory, launcher, label, marker, properties = []) { const output = fs.createWriteStream(path.join(directory, label + '.log')); const executable = phase === 'capture' ? spec.java8 : (spec.java || spec.java17); const launchArguments = phase === 'capture' ? ['-jar', launcher, 'nogui'] - : serverArguments(spec.serverRuntime, directory, '1.20.6', '50.2.0'); + : serverArguments(spec.serverRuntime, directory, '1.21.1', '52.1.0'); const child = spawn(executable, ['-Xms256m', '-Xmx2g', ...properties, ...launchArguments], { cwd: directory, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }); child.stdout.pipe(output, { end: false }); @@ -156,7 +167,7 @@ async function run(directory, launcher, label, marker, properties = []) { } const vanillaChanges = checkUpgradeLog(log); if (vanillaChanges.length) { - console.log(label + ' accepted removed vanilla registry names: ' + vanillaChanges.join(', ')); + console.log(label + ' accepted historical vanilla registry names: ' + vanillaChanges.join(', ')); } console.log(label + ' PASS'); return [...new Set(log.split(/\r?\n/) diff --git a/tools/validation/test_painting_registry.js b/tools/validation/test_painting_registry.js new file mode 100644 index 000000000..1c740ba84 --- /dev/null +++ b/tools/validation/test_painting_registry.js @@ -0,0 +1,23 @@ +const assert = require('node:assert/strict'); +const test = require('node:test'); +const { isVanillaPaintingSnapshot } = require('./painting_registry'); + +test('accepts vanilla paintings moved out of the old Forge snapshot', () => { + assert.equal(isVanillaPaintingSnapshot('minecraft:painting_variant', + ['minecraft:kebab', 'minecraft:aztec', 'minecraft:wither']), true); +}); + +test('does not hide an unknown or modded painting', () => { + for (const painting of ['minecraft:unknown', 'another_mod:painting']) { + assert.equal(isVanillaPaintingSnapshot('minecraft:painting_variant', + ['minecraft:kebab', painting]), false); + } +}); + +test('does not accept the same name from a different registry', () => { + assert.equal(isVanillaPaintingSnapshot('minecraft:block', ['minecraft:fire']), false); +}); + +test('does not accept an empty missing-mapping report', () => { + assert.equal(isVanillaPaintingSnapshot('minecraft:painting_variant', []), false); +});