diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46c717cf3..937c56bcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,19 @@ -name: Base Metals 1.21.1 CI +name: Base Metals 1.21.11 CI on: push: branches: - - master-1.21.1 + - master-1.21.11 - 'feature/**' pull_request: branches: - - master-1.21.1 + - master-1.21.11 permissions: contents: read concurrency: - group: basemetals-1.21.1-${{ github.workflow }}-${{ github.ref }} + group: basemetals-1.21.11-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -71,9 +71,9 @@ jobs: --no-daemon --stacktrace first="$RUNNER_TEMP/basemetals-first" mkdir -p "$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/libs/BaseMetals-3.1.1.121111.jar "$first/" + cp build/libs/BaseMetals-3.1.1.121111-sources.jar "$first/" + cp build/libs/BaseMetals-3.1.1.121111-javadoc.jar "$first/" cp build/release/SHA256SUMS "$first/" - name: Rebuild and prove byte-identical archives @@ -81,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.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/BaseMetals-3.1.1.121111.jar" build/libs/BaseMetals-3.1.1.121111.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121111-sources.jar" build/libs/BaseMetals-3.1.1.121111-sources.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.1.121111-javadoc.jar" build/libs/BaseMetals-3.1.1.121111-javadoc.jar cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS - name: Run all required GameTests @@ -95,14 +95,14 @@ jobs: - name: Install official Forge packaged runtimes id: forge-runtimes run: | - 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" + server_runtime="$RUNNER_TEMP/forge-1.21.11-61.1.0-server" + client_runtime="$RUNNER_TEMP/forge-1.21.11-61.1.0-client" + installer="$RUNNER_TEMP/forge-1.21.11-61.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.21.1-52.1.0/forge-1.21.1-52.1.0-installer.jar - echo "F1B620F2879AD6A5BBE15DABA4D8F81EAB9F5E08004967604960B98996BDEBC4 $installer" | sha256sum --check --strict + https://maven.minecraftforge.net/net/minecraftforge/forge/1.21.11-61.1.0/forge-1.21.11-61.1.0-installer.jar + echo "8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48 $installer" | sha256sum --check --strict ( cd "$server_runtime" java -jar "$installer" --installServer @@ -147,13 +147,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.21.1-${{ github.sha }} + name: BaseMetals-1.21.11-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - 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/libs/BaseMetals-3.1.1.121111.jar + build/libs/BaseMetals-3.1.1.121111-sources.jar + build/libs/BaseMetals-3.1.1.121111-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -161,7 +161,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.21.1-diagnostics-${{ github.sha }} + name: BaseMetals-1.21.11-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 39f539a7d..a8f9d82b7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.21.1 + - master-1.21.11 - 'feature/**' pull_request: branches: - - master-1.21.1 + - master-1.21.11 permissions: actions: read diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml index 2f2c732be..b37dfc947 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.21.1 + - master-1.21.11 - 'feature/**' pull_request: branches: - - master-1.21.1 + - master-1.21.11 permissions: contents: read diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cca6c2cd9..dd4450ea3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,15 @@ +Base Metals 3.1.1.121111 + +- Port the released 1.21.1 version to Minecraft 1.21.11 and Forge 61, keeping Java 21. +- Keep the existing gameplay, raw metals, ore overlays, filled buckets and High/Low Fantasy modes. +- Update equipment, recipes, projectiles, configuration screens and item models for the newer Minecraft APIs. +- Use vanilla copper nuggets, tools, armour, horse armour and bars for new crafting outputs. Keep old Base Metals items valid and accept both versions in shared ingredients. +- Replace the old JavaScript migration hooks with required Mixins, keeping the checks which protect modern worlds and current player data. +- Use the published OreSpawn 4.1.0.121111 release with the same eleven ore rules and copper defaults. +- Let OreSpawn defer early ore-host tag lookups until Minecraft has loaded the world's tags. +- Keep older Forge world-capability data readable after the saved-data format change. +- Keep filled-bucket textures together on the new texture atlases, including resource-pack replacements. + 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. diff --git a/README.md b/README.md index 1fe869cdd..b01a4f3a9 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.21.1)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.21.1) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-1.21.11)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.21.11) # Base Metals @@ -12,21 +12,23 @@ 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.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. +This is the Minecraft 1.21.11 Forge version, `3.1.1.121111`. It keeps the +fixes and features from the released 1.21.1 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.21.1` -- Forge `52.1.0` or newer in the Minecraft 1.21.1 Forge 52 line +- Minecraft `1.21.11` +- Forge `61.1.0` or newer in the Minecraft 1.21.11 Forge 61 line - A current Java 21 runtime -- OreSpawn `[4.1.0.121011,5.0.0)` on both client and server +- OreSpawn `[4.1.0.121111,5.0.0)` on both client and server -This version uses OreSpawn `4.1.0.121011`. Put -`BaseMetals-3.1.1.121011.jar` and a compatible OreSpawn JAR in the `mods` +The port has also been checked against Forge `61.2.4`. + +This version uses OreSpawn `4.1.0.121111`. Put +`BaseMetals-3.1.1.121111.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. @@ -45,10 +47,12 @@ 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. +blocks, nuggets, tools, armour, horse armour, bars, 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. +Existing Base Metals copper equipment keeps its +original behaviour. Notable mechanics include: @@ -146,7 +150,7 @@ 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 their Java integrations are not enabled -in this Forge 1.21.1 port. Do not add jars made for older Minecraft versions or +in this Forge 1.21.11 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. @@ -199,7 +203,7 @@ early splash window. Minecraft still opens its game window and runs the full world check. Ordinary client launches keep the normal splash screen. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121011`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121111`. 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 eed2f0646..a03e8b10a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,13 +9,14 @@ plugins { ext.mavenizerCompatibilityJar = layout.projectDirectory.file( 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar') ext.mavenizerCompatibilitySha256 = - '019032A4A26ECB473D403EF017054D5892CE59A9904E8831B452287CD756397E' + 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E' ext.mavenizerFixtureChecksums = [ 'minecraft-mavenizer-0.5.21-orespawn-compat.jar': mavenizerCompatibilitySha256, - 'minecraft-source-compatibility.json': '7F669F225520D0382E76991A8A3E5E4020840F0FA975F7DCB86681D7E7C3F766', - 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': '84FEA234619CC2D1931E609B22B6E5D96F59366F7D6C2783C3BEE0F726F3E876', - 'LICENSE-MAVENIZER.txt': '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331' + 'minecraft-source-compatibility.json': '88F2EE4C6B7C903EB1C7D693C0BEEFC0EFC601C1023FB197F7CBA187B1142DB7', + 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': '88F9035C8545CF1CBC7342C14F2F95076C4E415EDB7A74D585409CFC3F1BDD5C', + 'LICENSE-MAVENIZER.txt': '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331', + 'README.md': 'A097E126C606BDC86B34F5DDFB9580228A7C5BC866C6509C6BB362152EBACED7' ] // Mavenizer runs during configuration, so verify its inputs before configuring Forge. mavenizerFixtureChecksums.each { name, expected -> @@ -26,7 +27,7 @@ mavenizerFixtureChecksums.each { name, expected -> } } -// Forge 52 needs no source repairs. The sealed fixture records that result +// Forge 61 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) @@ -117,7 +118,7 @@ sourceSets { } dataGenerator { java.srcDir 'src/dataGenerator/java' - resources.setSrcDirs([]) + resources.setSrcDirs(['src/dataGenerator/resources']) compileClasspath += sourceSets.main.output runtimeClasspath += sourceSets.main.output } @@ -191,6 +192,7 @@ minecraft { workingDir.set(layout.projectDirectory.dir('run-optional-mods')) } jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED' + args '--mixin', 'basemetals.mixins.json' // Keep registry diagnostics available in development logs. systemProperty 'forge.logging.markers', 'REGISTRIES' diff --git a/ci-fixtures/tools/README.md b/ci-fixtures/tools/README.md index 62708bcbe..c115eb9e7 100644 --- a/ci-fixtures/tools/README.md +++ b/ci-fixtures/tools/README.md @@ -2,8 +2,8 @@ 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.21.1-52.1.0` development dependency and is excluded from every -Base Metals publication artifact. +exact Forge `1.21.11-61.1.0` development dependency and is excluded from every +OreSpawn 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.21.1-52.1.0` compiles without source compatibility edits. Its explicit +Forge `1.21.11-61.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.21.1 continue to compile for Java 21. +`ORESPAWN_MAVENIZER_OFFLINE=true`. Mavenizer itself runs on Java 25; OreSpawn +and Minecraft 1.21.11 continue to compile for Java 21. ## Rebuild @@ -39,7 +39,7 @@ and Minecraft 1.21.1 continue to compile for Java 21. 4. Run `./gradlew clean build --no-daemon` (or `gradlew.bat` on Windows). 5. Copy `build/libs/minecraft-mavenizer-0.5.21.jar` to `minecraft-mavenizer-0.5.21-orespawn-compat.jar`. -6. Run Base Metals' `verifyMavenizerCompatibilityFixture` task. The build script +6. Run OreSpawn's `verifyMavenizerCompatibilityFixture` task. The build script contains the authoritative checksums and also verifies the embedded manifest, Java class version and licence/provenance files. 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 3bc4e389f..067437747 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 a8739436d..067736433 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.21.1-52.1.0": { ++ "net.minecraftforge:forge:1.21.11-61.1.0": { + "expectedApplications": 0, + "rules": [] + } diff --git a/ci-fixtures/tools/minecraft-source-compatibility.json b/ci-fixtures/tools/minecraft-source-compatibility.json index 7070e4993..4d6c9e88a 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.21.1-52.1.0": { + "net.minecraftforge:forge:1.21.11-61.1.0": { "expectedApplications": 0, "rules": [] } diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index a602dbacc..d83e52bf7 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -7,7 +7,8 @@ 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`. -Copper ingots, storage blocks, doors, trapdoors, slabs and stairs use their +Copper ingots, nuggets, tools, armour, horse armour, bars, 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. @@ -19,7 +20,7 @@ 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. Their Java API hooks -and runtime jars are not included in this Forge 1.21.1 port. Do not substitute +and runtime jars are not included in this Forge 1.21.11 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 5d12b5b0b..bd944f13c 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -1,8 +1,8 @@ # Migrating from Base Metals 1.10 or 1.12 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.21.1 instance. +3.1.1 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.21.11 instance. Minecraft's data fixer cannot identify third-party numeric block IDs from before the 1.13 flattening. Base Metals snapshots those positions, runs @@ -12,17 +12,18 @@ Any vanilla block entities which Mojang's fixer inferred from a reused mod numeric ID are removed at those positions. Vanilla's context-sensitive block, block-entity, entity, inventory, map, statistics, objective, jukebox, spawn egg, banner, and villager fixes still run everywhere else. The migrator reads -the exact numeric map from an untouched legacy `level.dat`, `level.dat_old`, -or the `basemetals-legacy-registry.dat` snapshot -when available. If neither retains a legacy map, it uses the map captured from +the numeric map captured from the current legacy `level.dat` or the world-local +`basemetals-legacy-registry.dat` snapshot. An old backup is never used to start +conversion. If a proven legacy save has no registry map, it uses the map captured from the public Base Metals 2.5.0-rc2.332 and MMDLib 1.0.0-rc2.36 runtime. Before replacing any region file, `level.dat`, or playerdata file, the migrator copies the original to `basemetals-1.12-region-backup` inside the world. Region replacements are transactional. A completed scan writes -`BASEMETALS_1_12_BLOCK_MIGRATION_COMPLETE.txt`, recording either the conversion -summary or that no legacy content was present; subsequent starts do nothing. +`BASEMETALS_1_12_BLOCK_MIGRATION_COMPLETE.txt` with a conversion summary. +Later starts do not repeat the completed scan. Modern worlds do not +receive a legacy conversion marker or backup. The packaged fallback map covers the exact public 1.12 runtime. With a saved legacy registry map, blocks from the world's other 1.10/1.12 mods also retain @@ -32,14 +33,14 @@ state. Base Metals and historical `mmdlib:*` states retain their old metadata semantics, including complete paired-door state. If neither legacy level file contains an ID used by a numeric chunk, migration stops instead of guessing or deleting it. Restore the backed-up regions and recover the world's original -`level.dat_old` before retrying. Forge normally creates that file before Base -Metals' migration hook runs; keep it beside `level.dat` for the first upgrade. +world metadata before retrying. Do not replace the current metadata with an +unrelated or stale backup. This supports both the original Cyano Base Metals 2.4 line and the later MMD Base Metals 2.5 line. Registry paths containing uppercase characters, which Minecraft 1.10 still allowed, are normalized to the lowercase form required by modern Minecraft. -Base Metals 3.1.0 preserves historical `basemetals:*` IDs, including hidden +This version preserves historical `basemetals:*` IDs, including hidden `double__slab` blocks and molten-fluid block IDs such as `basemetals:adamantine`. Dedicated bucket items and flowing-fluid registry entries are new. Legacy `forge:bucketfilled` stacks containing Base Metals @@ -86,12 +87,18 @@ Old inventories remain valid in either content mode. A configuration without `contentMode` starts in High Fantasy; Low Fantasy only restricts new acquisition. The mode is a server or modpack setting, not a setting stored in each world. -## Moving from 1.20.1 +## Moving from 1.20.1 through 1.21.1 -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 +Minecraft stores item properties as components rather than the older item tag, +and newer versions also store worn equipment differently. Base Metals keeps +names, enchantments, durability and custom data during that conversion. Saved arrows and bolts also retain their ammunition. +Forge 61 adds another wrapper to saved world-capability data. Base Metals reads +both the older payload and the current wrapper, so installed mods receive their +saved data rather than an empty replacement. New saves use Forge's current +format. This does not enable legacy block conversion in a modern world. + Make the first upgrade on a copy, then check stored equipment and inventories before using the upgraded world normally. Keep the original: a converted world must not be opened in an older Minecraft version. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 06049ee31..04a6d99b7 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -1,17 +1,22 @@ # Supported versions -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)`. +Base Metals `3.1.1.121111` targets Minecraft 1.21.11, Forge 61.1.0 and Java 21. +Packaged client, server and save-upgrade checks also pass on Forge 61.2.4. +OreSpawn `4.1.0.121111` is the exact build and test dependency. Clients and +servers need OreSpawn `[4.1.0.121111,5.0.0)`. -The pinned CurseForge artifact is project 245586, file 9189594: -`curse.maven:mmd-orespawn-245586:9189594`. +The pinned CurseForge artifact is project 245586, file 9268464: +`curse.maven:mmd-orespawn-245586:9268464`. Its SHA-256 is -`EB369B7D7CE6D6C453658347A420C2F0783B7F4D1AC7383C87176AC05192B5A0`. +`DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B`. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121011`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.1.121111`. 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 have not changed. + +The data pack uses format `94.1`. Forge wraps client mod resources with the +native resource-pack format `75.0`. The resource metadata retains the minor +version rather than rounding the data format down to `94`. diff --git a/docs/WORLDGEN.md b/docs/WORLDGEN.md index e743dd03c..a6e565cb5 100644 --- a/docs/WORLDGEN.md +++ b/docs/WORLDGEN.md @@ -1,8 +1,8 @@ # OreSpawn world generation -Base Metals requires OreSpawn `[4.1.0.121011,5.0.0)` and packages provider schema 3, +Base Metals requires OreSpawn `[4.1.0.121111,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.121011` release. The provider is checked against the +published OreSpawn `4.1.0.121111` 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 05b3e92d9..7629b7b74 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.121011. The Base Metals provider +These public schemas match OreSpawn 4.1.0.121111. 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.121011](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.121011). +Source: [OreSpawn 4.1.0.121111](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.121111). diff --git a/gradle.properties b/gradle.properties index fd47631bf..db7f0b26c 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.21.1 +minecraft_version=1.21.11 # 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.21.1,1.21.2) +minecraft_version_range=[1.21.11,1.22) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=52.1.0 -forge_installer_sha256=F1B620F2879AD6A5BBE15DABA4D8F81EAB9F5E08004967604960B98996BDEBC4 +forge_version=61.1.0 +forge_installer_sha256=8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48 # 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.121011 +orespawn_version=4.1.0.121111 orespawn_curse_project_id=245586 -orespawn_curse_file_id=9189594 -orespawn_sha256=EB369B7D7CE6D6C453658347A420C2F0783B7F4D1AC7383C87176AC05192B5A0 +orespawn_curse_file_id=9268464 +orespawn_sha256=DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B # The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[52.1.0,53) +forge_version_range=[61.1.0,62) # The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[52,53) +loader_version_range=[61,62) # 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=[52,53) 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.21.1 +mapping_version=1.21.11 ## 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.1.121011 +mod_version=3.1.1.121111 # 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 52 uses official runtime names. +# Forge 61 uses official runtime names. reobf=false -mcp_version=20240808.132146 +mcp_version=20251223.124241 java_setup_version=21.0.7+6.0.LTS diff --git a/gradle/README.md b/gradle/README.md index 83435058a..977083dfa 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -20,6 +20,7 @@ Keep machine-specific paths in Gradle properties, never in these scripts. Model and data providers live in the separate `dataGenerator` source set. Use `generateResources` after changing them to update the committed resources. +Run it before starting a separate build, so resource processing sees the new files. `check` generates a temporary copy and reports differences without changing source files. Neither the providers nor test probes enter ordinary game launches or public jars. @@ -30,10 +31,14 @@ 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.21.1. The Mekanism, Tinkers, Thermal and Ender IO Java +are pinned for Forge 1.21.11. The Mekanism, Tinkers, Thermal and Ender IO Java integrations are not enabled here; their dormant data remains available for future integration work. +Filled buckets use three atlas aliases from the vanilla bucket and Forge masks. +They keep the bucket and molten fluid on the block atlas without copying those +textures, so resource packs can still replace them. + Run `prepareEclipse` after importing the project or refreshing Gradle. It generates the launches, copies processed resources and checks that ordinary runs cannot see tests or probes. Client launches explicitly select the client diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index fa94d843d..ef3387683 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.21.1 release in + // never shaded into Base Metals. Use the published 1.21.11 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}" - // Optional Java integrations are not enabled in this Forge 1.21.1 port. + // Optional Java integrations are not enabled in this Forge 1.21.11 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 581d83fb9..e7442b776 100644 --- a/gradle/ide/eclipse.gradle +++ b/gradle/ide/eclipse.gradle @@ -73,7 +73,7 @@ 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.21.1 dependencies') + throw new GradleException('The optional client must load the pinned 1.21.11 dependencies') } } } @@ -317,7 +317,7 @@ 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.1.121011"')) { + if (metadata.contains('${') || !metadata.contains('version="3.1.1.121111"')) { throw new GradleException('Eclipse output contains unresolved or invalid Base Metals version metadata') } } diff --git a/gradle/release/artifacts.gradle b/gradle/release/artifacts.gradle index 70e124417..83ddede2b 100644 --- a/gradle/release/artifacts.gradle +++ b/gradle/release/artifacts.gradle @@ -53,6 +53,7 @@ tasks.named('jar', Jar) { manifest { attributes([ 'Maven-Artifact' : expectedMavenCoordinate, + 'MixinConfigs' : 'basemetals.mixins.json', 'Specification-Title' : 'Base Metals', 'Specification-Vendor' : project.mod_authors, 'Specification-Version' : '1', @@ -183,7 +184,7 @@ tasks.register('verifyMavenCoordinates') { tasks.register('verifyMavenizerCompatibilityFixture') { group = 'verification' - description = 'Verifies the checksum-sealed Forge 1.21.1 Mavenizer compatibility fixture.' + description = 'Verifies the checksum-sealed Forge 1.21.11 Mavenizer compatibility fixture.' inputs.file project.ext.mavenizerCompatibilityJar doLast { File fixture = project.ext.mavenizerCompatibilityJar.asFile @@ -197,23 +198,23 @@ tasks.register('verifyMavenizerCompatibilityFixture') { tasks.register('verifyReleaseConfiguration') { group = 'verification' - description = 'Verifies the exact Base Metals 1.21.1 release identity.' + description = 'Verifies the exact Base Metals 1.21.11 release identity.' dependsOn tasks.named('verifyMavenizerCompatibilityFixture') dependsOn tasks.named('verifyJava21Toolchain') doLast { - if (configuredReleaseIdentity.modVersion != '3.1.1.121011' + if (configuredReleaseIdentity.modVersion != '3.1.1.121111' || configuredReleaseIdentity.modGroup != expectedMavenGroup - || configuredReleaseIdentity.minecraftVersion != '1.21.1' - || configuredReleaseIdentity.forgeVersion != '52.1.0' - || configuredReleaseIdentity.forgeInstallerSha256 != 'F1B620F2879AD6A5BBE15DABA4D8F81EAB9F5E08004967604960B98996BDEBC4' + || configuredReleaseIdentity.minecraftVersion != '1.21.11' + || configuredReleaseIdentity.forgeVersion != '61.1.0' + || configuredReleaseIdentity.forgeInstallerSha256 != '8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48' || configuredReleaseIdentity.mappingChannel != 'official' - || configuredReleaseIdentity.mappingVersion != '1.21.1' + || configuredReleaseIdentity.mappingVersion != '1.21.11' || configuredReleaseIdentity.loaderName != 'forge' || configuredReleaseIdentity.loaderCode != '1' || configuredReleaseIdentity.javaVersion != '21' || configuredReleaseIdentity.gradleJavaVersion != '21' || configuredReleaseIdentity.curseForgeProjectId != '240967') { - throw new GradleException('Unexpected Base Metals 1.21.1 release identity') + throw new GradleException('Unexpected Base Metals 1.21.11 release identity') } } } @@ -222,10 +223,10 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn qualification dependency.' doLast { - if (configuredOreSpawnIdentity.version != '4.1.0.121011' + if (configuredOreSpawnIdentity.version != '4.1.0.121111' || configuredOreSpawnIdentity.curseProjectId != '245586' - || configuredOreSpawnIdentity.curseFileId != '9189594' - || configuredOreSpawnIdentity.sha256 != 'EB369B7D7CE6D6C453658347A420C2F0783B7F4D1AC7383C87176AC05192B5A0') { + || configuredOreSpawnIdentity.curseFileId != '9268464' + || configuredOreSpawnIdentity.sha256 != 'DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B') { throw new GradleException('Unexpected OreSpawn release coordinates') } File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts @@ -300,6 +301,7 @@ tasks.register('verifyReleaseArtifacts') { [ 'META-INF/mods.toml', 'META-INF/MANIFEST.MF', + 'basemetals.mixins.json', 'pack.mcmeta', 'data/basemetals/orespawn/provider.json', 'data/basemetals/recipe/stone_crackhammer.json', @@ -311,17 +313,21 @@ tasks.register('verifyReleaseArtifacts') { if (!names.contains(required)) throw new GradleException("Release jar is missing ${required}") } def manifest = new java.util.jar.Manifest(zip.getInputStream(zip.getEntry('META-INF/MANIFEST.MF'))) + if (manifest.mainAttributes.getValue('MixinConfigs') != 'basemetals.mixins.json' + || names.contains('META-INF/coremods.json') || names.any { it.startsWith('coremods/') }) { + throw new GradleException('Release jar must use the required native Mixins, not JavaScript coremods') + } if (manifest.mainAttributes.getValue('Maven-Artifact') != expectedMavenCoordinate) { throw new GradleException('Release manifest contains the wrong Maven coordinate') } - String expectedBuildTarget = 'minecraft-1.21.1-forge-52.1.0-java-21' + String expectedBuildTarget = 'minecraft-1.21.11-forge-61.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.1.121011"') - || !modsToml.contains('versionRange="[4.1.0.121011,5.0.0)"')) { + || !modsToml.contains('version="3.1.1.121111"') + || !modsToml.contains('versionRange="[4.1.0.121111,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 3d0566966..ad9aa2aa4 100644 --- a/gradle/verification/packaged-runtime.gradle +++ b/gradle/verification/packaged-runtime.gradle @@ -134,8 +134,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.21.1-52.1.0') - File launcher = new File(forgeDirectory, 'forge-1.21.1-52.1.0-server.jar') + File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.21.11-61.1.0') + File launcher = new File(forgeDirectory, 'forge-1.21.11-61.1.0-server.jar') File sourceArguments = new File(forgeDirectory, System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows') ? 'win_args.txt' : 'unix_args.txt') @@ -174,9 +174,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.1.121011' - || values.getProperty('orespawn') != '4.1.0.121011' - || values.getProperty('forge') != '52.1.0') { + if (values.getProperty('basemetals') != '3.1.1.121111' + || values.getProperty('orespawn') != '4.1.0.121111' + || values.getProperty('forge') != '61.1.0') { throw new GradleException("Packaged dedicated-server versions are wrong: ${values}") } verifyPackagedLog(runDirectory, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', @@ -219,11 +219,11 @@ 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.21.1/1.21.1.jar')).withCloseable { zip -> + new java.util.zip.ZipFile(new File(runtime, 'versions/1.21.11/1.21.11.jar')).withCloseable { zip -> texture.bytes = zip.getInputStream(zip.getEntry('assets/minecraft/textures/block/dirt.png')).bytes } new File(hostPack, 'pack.mcmeta').setText( - '{"pack":{"pack_format":32,"description":"Ore host replacement test"}}\n', 'UTF-8') + '{"pack":{"min_format":[75,0],"max_format":[75,0],"description":"Ore host replacement test"}}\n', 'UTF-8') new File(runDirectory, 'options.txt').append( 'resourcePacks:["vanilla","mod_resources","file/basemetals-host-test"]\n', 'UTF-8') } @@ -243,13 +243,13 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex dependsOn preparePackagedClientSmoke doFirst { File runtime = requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime') - String forgeVersionId = ['1.21.1-forge-52.1.0', 'forge-52.1.0'].find { candidate -> + String forgeVersionId = ['1.21.11-forge-61.1.0', 'forge-61.1.0'].find { candidate -> new File(runtime, "versions/${candidate}/${candidate}.json").isFile() } - if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 52.1.0 profile') + if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 61.1.0 profile') File forgeJsonFile = new File(runtime, "versions/${forgeVersionId}/${forgeVersionId}.json") - 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 baseJsonFile = new File(runtime, 'versions/1.21.11/1.21.11.json') + File baseJar = new File(runtime, 'versions/1.21.11/1.21.11.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 f9ddd9783..87562d3e5 100644 --- a/gradle/verification/support.gradle +++ b/gradle/verification/support.gradle @@ -90,6 +90,11 @@ tasks.register('generateResources', Sync) { into generatedResourcesDir } +// Honour an explicit resource refresh without making ordinary builds rewrite it. +tasks.named('sourcesJar').configure { + mustRunAfter tasks.named('generateResources') +} + def verifyGeneratedData = tasks.register('verifyGeneratedData') { group = 'verification' description = 'Compares native datagen output with checked-in resources without modifying them.' @@ -118,6 +123,7 @@ def prepareGameTestStructures = tasks.register('prepareGameTestStructures') { group = 'verification' description = 'Creates the empty structure used by the isolated GameTests.' outputs.dir gameTestResources + inputs.files(fileTree('src/gametest/java') { include '**/*.java' }) doLast { File structure = new File(gameTestResources.get().asFile, 'data/basemetals/structure/empty.nbt') structure.parentFile.mkdirs() @@ -135,6 +141,34 @@ def prepareGameTestStructures = tasks.register('prepareGameTestStructures') { nbt.writeByte(0) } } + + File instances = new File(gameTestResources.get().asFile, 'data/basemetals/test_instance') + delete instances + instances.mkdirs() + int count = 0 + + fileTree('src/gametest/java').matching { include '**/*.java' }.files.sort().each { source -> + def methods = source.getText('UTF-8') =~ /(?s)@GameTest\((.*?)\)\s+public static void (\w+)\(/ + + methods.each { match -> + String annotation = match[1] + String name = match[2].replaceAll(/([A-Z])/, '_$1').toLowerCase(Locale.ROOT) + def maxTicks = annotation =~ /maxTicks\s*=\s*(\d+)/ + def setupTicks = annotation =~ /setupTicks\s*=\s*(\d+)/ + Map data = [type: 'minecraft:function', function: "basemetals:${name}", + environment: 'minecraft:default', structure: 'basemetals:empty', + max_ticks: maxTicks.find() ? maxTicks.group(1).toInteger() : 100, + setup_ticks: setupTicks.find() ? setupTicks.group(1).toInteger() : 0] + + new File(instances, "${name}.json").setText( + groovy.json.JsonOutput.prettyPrint(groovy.json.JsonOutput.toJson(data)) + '\n', 'UTF-8') + count++ + } + } + + if (count != 46) { + throw new GradleException("Expected 46 native GameTest instances, found ${count}") + } } } @@ -147,6 +181,7 @@ tasks.matching { it.name == 'prepareRunGameTestServer' }.configureEach { tasks.matching { it.name == 'runGameTestServer' }.configureEach { dependsOn prepareGameTestStructures + args '--tests', 'basemetals:*' doFirst { File runDirectory = layout.projectDirectory.dir('run-gametest').asFile runDirectory.mkdirs() @@ -163,7 +198,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 43 required tests passed/).find()) { + if (!(text =~ /All 46 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/BMBlockStateProvider.java b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java index bfdb9a559..4e76b1885 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java @@ -1,80 +1,100 @@ package zone.moddev.mc.basemetals.data; -import net.minecraft.data.DataGenerator; -import net.minecraft.resources.ResourceLocation; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; -import net.minecraftforge.client.model.generators.BlockModelBuilder; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; import zone.moddev.mc.basemetals.content.ModContent; import zone.moddev.mc.basemetals.material.MaterialCatalogue; -import zone.moddev.mc.basemetals.material.MaterialDefinition; + +import static zone.moddev.mc.basemetals.data.BaseMetalsDataGenerators.object; /** - * Builds ores from a vanilla host texture and a transparent ore overlay. + * Builds ores from a vanilla host and a transparent overlay. * * @author KiriCattus (Kiri), original two-layer model */ @Mod.EventBusSubscriber(modid = "basemetals", bus = Mod.EventBusSubscriber.Bus.MOD) -public final class BMBlockStateProvider extends BlockStateProvider { +public final class BMBlockStateProvider implements DataProvider { private static final float OVERLAY_OFFSET = 0.05F; + private final java.nio.file.Path output; + private final List> writes = new ArrayList<>(); - public BMBlockStateProvider(net.minecraft.data.PackOutput generator, ExistingFileHelper existingFiles) { - super(generator, "basemetals", existingFiles); + public BMBlockStateProvider(PackOutput output) { + this.output = output.getOutputFolder(); } - @Override - public String getName() { return "Ore overlays: basemetals"; } - @SubscribeEvent public static void gatherData(GatherDataEvent event) { if (event.includeClient()) { - event.getGenerator().addProvider(true, new BMBlockStateProvider( - event.getGenerator().getPackOutput(), event.getExistingFileHelper())); + event.getGenerator().addProvider(true, new BMBlockStateProvider(event.getGenerator().getPackOutput())); } } @Override - protected void registerStatesAndModels() { - for (MaterialDefinition material : MaterialCatalogue.ALL) { + public CompletableFuture run(CachedOutput cache) { + writes.clear(); + for (var material : MaterialCatalogue.ALL) { if (!material.hasOre()) continue; - Block block = ModContent.blocksById().get(material.name() + "_ore").get(); - String host = "stone"; - if (material.name().equals("adamantine") || material.name().equals("coldiron")) { - host = "netherrack"; - } else if (material.name().equals("starsteel")) { - host = "end_stone"; - } - - createOverlayOre(block, mcLoc("block/" + host), - modLoc("block/ore_overlays/" + material.name() + "_ore")); + String host = switch (material.name()) { + case "adamantine", "coldiron" -> "netherrack"; + case "starsteel" -> "end_stone"; + default -> "stone"; + }; + createOverlayOre(cache, ModContent.blocksById().get(material.name() + "_ore").get(), + Identifier.withDefaultNamespace("block/" + host), + Identifier.fromNamespaceAndPath("basemetals", "block/ore_overlays/" + material.name() + "_ore")); } + + return CompletableFuture.allOf(writes.toArray(CompletableFuture[]::new)); } - private void createOverlayOre(Block block, ResourceLocation baseTexture, ResourceLocation overlayTexture) { + private void createOverlayOre(CachedOutput cache, Block block, Identifier baseTexture, Identifier overlayTexture) { String blockName = ForgeRegistries.BLOCKS.getKey(block).getPath(); + JsonObject textures = object("particle", baseTexture, "base", baseTexture, "overlay", overlayTexture); + JsonArray elements = new JsonArray(); + elements.add(cube(0, 16, "#base")); + // Keep the overlay clear of the host, including distant mip levels. + elements.add(cube(-OVERLAY_OFFSET, 16 + OVERLAY_OFFSET, "#overlay")); - BlockModelBuilder builder = models().withExistingParent(blockName, mcLoc("block/block")) - .texture("particle", baseTexture) - .texture("base", baseTexture) - .texture("overlay", overlayTexture) - .element() - .from(0, 0, 0) - .to(16, 16, 16) - .allFaces((direction, face) -> face.texture("#base").cullface(direction)) - .end() - // Keep the overlay clear of the host, including distant mip levels. - .element() - .from(-OVERLAY_OFFSET, -OVERLAY_OFFSET, -OVERLAY_OFFSET) - .to(16 + OVERLAY_OFFSET, 16 + OVERLAY_OFFSET, 16 + OVERLAY_OFFSET) - .allFaces((direction, face) -> face.texture("#overlay").cullface(direction)) - .end(); + JsonObject model = object("parent", "minecraft:block/block", "textures", textures, "elements", elements); + writes.add(DataProvider.saveStable(cache, model, + output.resolve("assets/basemetals/models/block/" + blockName + ".json"))); + writes.add(DataProvider.saveStable(cache, + object("variants", object("", object("model", "basemetals:block/" + blockName))), + output.resolve("assets/basemetals/blockstates/" + blockName + ".json"))); + } + + private static JsonObject cube(float from, float to, String texture) { + JsonArray start = new JsonArray(); + JsonArray end = new JsonArray(); + for (int axis = 0; axis < 3; axis++) { + start.add(from); + end.add(to); + } + + JsonObject faces = new JsonObject(); + for (String direction : List.of("down", "up", "north", "south", "west", "east")) { + faces.add(direction, object("texture", texture, "cullface", direction)); + } + + return object("from", start, "to", end, "faces", faces); + } - simpleBlock(block, builder); + @Override + public String getName() { + return "Base Metals ore overlays"; } } 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 b3c145130..a741b2b55 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/BaseMetalsDataGenerators.java @@ -1,234 +1,248 @@ package zone.moddev.mc.basemetals.data; -import zone.moddev.mc.basemetals.BaseMetals; - -import net.minecraft.core.Direction; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import net.minecraft.core.component.DataComponents; +import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.client.model.generators.loaders.DynamicFluidContainerModelBuilder; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.level.block.*; import net.minecraftforge.data.event.GatherDataEvent; - -import zone.moddev.mc.basemetals.content.CompatibilityDoubleSlabBlock; -import zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock; -import zone.moddev.mc.basemetals.content.HumanDetectorBlock; -import zone.moddev.mc.basemetals.content.ModContent; -import zone.moddev.mc.basemetals.content.PlateBlock; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.content.*; import zone.moddev.mc.basemetals.material.MaterialCatalogue; -import net.minecraft.world.level.block.AnvilBlock; -import net.minecraft.world.level.block.ButtonBlock; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.IronBarsBlock; -import net.minecraft.world.level.block.LeverBlock; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.PressurePlateBlock; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.TrapDoorBlock; -import net.minecraft.world.level.block.WallBlock; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; - +/** Material-independent shapes are shared templates; item definitions use native model properties. */ @Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public final class BaseMetalsDataGenerators { - private BaseMetalsDataGenerators() {} +public final class BaseMetalsDataGenerators implements DataProvider { + private final Path output; + private final List> writes = new ArrayList<>(); + + private BaseMetalsDataGenerators(PackOutput output) { + this.output = output.getOutputFolder(); + } @SubscribeEvent public static void gather(GatherDataEvent event) { DataGenerator generator = event.getGenerator(); if (event.includeClient()) { - generator.addProvider(true, new States(generator.getPackOutput(), event.getExistingFileHelper())); - generator.addProvider(true, new Items(generator.getPackOutput(), event.getExistingFileHelper())); + generator.addProvider(true, new BaseMetalsDataGenerators(generator.getPackOutput())); } generator.addProvider(true, new GeneratedData(generator.getPackOutput())); } - private static final class States extends BlockStateProvider { - private States(net.minecraft.data.PackOutput generator, ExistingFileHelper helper) { - super(generator, BaseMetals.MOD_ID, helper); - } + @Override + public CompletableFuture run(CachedOutput cache) { + writes.clear(); - @Override - protected void registerStatesAndModels() { - ModContent.blocksById().forEach((id, object) -> { - net.minecraft.world.level.block.Block block = object.get(); - if (block instanceof LiquidBlock || id.endsWith("_ore")) return; - if (block instanceof PlateBlock) { - plateBlock(block, existing(id)); - } else if (block instanceof IronBarsBlock bars) { - barsBlock(bars, id); - } else if (block instanceof DoorBlock door) { - doorBlock(door, modLoc("block/" + id + "_lower"), modLoc("block/" + id + "_upper")); - } else if (block instanceof TrapDoorBlock trapdoor) { - trapdoorBlock(trapdoor, existing(id + "_bottom"), existing(id + "_top"), - existing(id + "_open"), true); - } else if (block instanceof ButtonBlock button) { - buttonBlock(button, existing(id), existing(id + "_pressed")); - } else if (block instanceof SlabBlock slab) { - String base = id.startsWith("double_") ? id.substring(7, id.length() - 5) : id.substring(0, id.length() - 5); - slabBlock(slab, existing("half_slab_" + base), existing("upper_slab_" + base), - fullBlockModel(base)); - } else if (block instanceof PressurePlateBlock plate) { - pressurePlateBlock(plate, existing(id + "_up"), existing(id + "_down")); - } else if (block instanceof StairBlock stairs) { - stairsBlock(stairs, existing(id), existing(baseName(id) + "_inner_stairs"), - existing(baseName(id) + "_outer_stairs")); - } else if (block instanceof WallBlock wall) { - wallBlock(wall, existing(id + "_post"), existing(id + "_side"), - models().wallSideTall(id + "_side_tall", fullBlockTexture(id.substring(0, id.length() - 5)))); - } else if (block instanceof LeverBlock lever) { - getVariantBuilder(lever).forAllStates(state -> ConfiguredModel.builder() - .modelFile(existing(state.getValue(BlockStateProperties.POWERED) ? id : id + "_off")).build()); - } else if (block instanceof HumanDetectorBlock detector) { - pressurePlateBlock(detector, existing("human_detector_up"), existing("human_detector_down")); - } else if (block instanceof BaseMetalAnvilBlock anvil) { - getVariantBuilder(anvil).forAllStates(state -> ConfiguredModel.builder() - .modelFile(existing(id + switch (state.getValue(BaseMetalAnvilBlock.DAMAGE)) { - case 0 -> "_undamaged"; - case 1 -> "_slightly_damaged"; - default -> "_very_damaged"; - })) - .rotationY(switch (state.getValue(AnvilBlock.FACING)) { - case SOUTH -> 0; - case WEST -> 90; - case NORTH -> 180; - case EAST -> 270; - default -> 0; - }).build()); - } else { - simpleBlock(block, existing(id)); - } - }); + try { + writeBlockAssets(cache); + writeItemAssets(cache); + writeEquipment(cache); + } catch (IOException exception) { + return CompletableFuture.failedFuture(exception); } - private void plateBlock(net.minecraft.world.level.block.Block block, ModelFile model) { - getVariantBuilder(block).forAllStates(state -> { - Direction facing = state.getValue(PlateBlock.FACING); - int x = switch (facing) { - case DOWN -> 90; - case UP -> 270; - default -> 0; - }; - int y = switch (facing) { - case EAST -> 90; - case SOUTH -> 180; - case WEST -> 270; - default -> 0; - }; - return ConfiguredModel.builder() - .modelFile(model) - .rotationX(x) - .rotationY(y) - .build(); - }); - } + return CompletableFuture.allOf(writes.toArray(CompletableFuture[]::new)); + } - private ModelFile existing(String name) { - return models().getExistingFile(modLoc("block/" + name)); + private void writeBlockAssets(CachedOutput cache) throws IOException { + for (var entry : ModContent.blocksById().entrySet()) { + String id = entry.getKey(); + Block block = entry.getValue().get(); + if (block instanceof LiquidBlock || id.endsWith("_ore")) continue; + + String shape = block instanceof PlateBlock ? "plate" + : block instanceof IronBarsBlock ? "bars" + : block instanceof DoorBlock ? "door" + : block instanceof TrapDoorBlock ? "trapdoor" + : block instanceof ButtonBlock ? "button" + : block instanceof SlabBlock ? "slab" + : block instanceof HumanDetectorBlock ? "human_detector" + : block instanceof PressurePlateBlock ? "pressure_plate" + : block instanceof StairBlock ? "stairs" + : block instanceof WallBlock ? "wall" + : block instanceof LeverBlock ? "lever" + : block instanceof BaseMetalAnvilBlock ? "anvil" : "block"; + String material = id.startsWith("double_") ? id.substring(7, id.length() - 5) + : shape.equals("human_detector") ? "" : id.substring(0, id.length() - shape.length() - 1); + + save(cache, template("blockstates/" + shape, material, id), + "blockstates/" + id + ".json"); + + if (shape.equals("door")) { + for (String half : List.of("bottom", "top")) { + for (String side : List.of("left", "right")) { + for (String open : List.of("", "_open")) { + String part = "door_" + half + "_" + side + open; + save(cache, template("block/" + part, material, id), + "models/block/" + material + "_" + part + ".json"); + } + } + } + } else if (shape.equals("wall") || shape.equals("bars")) { + String part = shape.equals("wall") ? "wall_side_tall" : "bars_post_ends"; + save(cache, template("block/" + part, material, id), + "models/block/" + material + "_" + part + ".json"); + } } + } - private ModelFile fullBlockModel(String material) { - return MaterialCatalogue.BY_NAME.containsKey(material) - ? existing(material + "_block") - : models().getExistingFile(mcLoc("block/" + (material.equals("obsidian") - ? "obsidian" : material + "_block"))); - } + private static JsonObject template(String name, String material, String id) throws IOException { + try (InputStream stream = BaseMetalsDataGenerators.class.getResourceAsStream( + "/datagen/templates/" + name + ".json")) { + if (stream == null) throw new IOException("Missing model template " + name); + + String fullBlock = name.equals("blockstates/block") || MaterialCatalogue.BY_NAME.containsKey(material) + ? "basemetals:block/" + material + "_block" + : "minecraft:block/" + (material.equals("obsidian") ? "obsidian" : material + "_block"); + if (name.equals("block/wall_side_tall") && material.equals("quartz")) { + fullBlock = "minecraft:block/quartz_block_side"; + } + String json = new String(stream.readAllBytes(), StandardCharsets.UTF_8) + .replace("basemetals:block/copper_block", fullBlock) + .replace("copper", material).replace("steel_anvil", id); - private net.minecraft.resources.ResourceLocation fullBlockTexture(String material) { - return MaterialCatalogue.BY_NAME.containsKey(material) - ? modLoc("block/" + material + "_block") - : mcLoc("block/" + switch (material) { - case "obsidian" -> "obsidian"; - case "quartz" -> "quartz_block_side"; - default -> material + "_block"; - }); + return JsonParser.parseString(json).getAsJsonObject(); } + } - private void barsBlock(IronBarsBlock bars, String id) { - var ends = models().getBuilder(id + "_post_ends").ao(false) - .texture("particle", modLoc("block/" + id)) - .texture("edge", modLoc("block/" + id)); + private void writeItemAssets(CachedOutput cache) throws IOException { + for (var entry : ModContent.itemsById().entrySet()) { + String id = entry.getKey(); + var item = entry.getValue().get(); + + if (id.endsWith("_raw") || id.endsWith("_blend") || id.endsWith("_smallblend")) { + String texture = id.endsWith("_smallblend") ? id.replace("_smallblend", "_smallpowder") + : id.endsWith("_blend") ? id.replace("_blend", "_powder") : id; + if (id.endsWith("_raw") || id.startsWith("diamond_") || id.startsWith("gold_") || id.startsWith("iron_")) { + save(cache, object("parent", "minecraft:item/generated", + "textures", object("layer0", "basemetals:item/" + texture)), + "models/item/" + id + ".json"); + } + } - for (float height : new float[] {0.001F, 15.999F}) { - ends.element().from(7, height, 7).to(9, height, 9) - .face(Direction.DOWN).uvs(7, 7, 9, 9).texture("#edge").end() - .face(Direction.UP).uvs(7, 7, 9, 9).texture("#edge").end() - .end(); + JsonObject model = model(id); + if (item instanceof MaterialItems.Bow || item instanceof MaterialItems.Crossbow) { + JsonArray entries = new JsonArray(); + entries.add(object("threshold", 0.65, "model", model(id + "_pulling_1"))); + entries.add(object("threshold", 0.9, "model", model(id + "_pulling_2"))); + JsonObject draw = object("type", "minecraft:range_dispatch", "property", "minecraft:use_duration", + "scale", 0.05, "fallback", model(id + "_pulling_0"), "entries", entries); + model = condition("minecraft:using_item", draw, model); + } else if (item instanceof MaterialItems.FishingRod) { + model = condition("minecraft:fishing_rod/cast", model(id + "_cast"), model); + } else if (item instanceof MaterialItems.Shield) { + model = condition("minecraft:using_item", model(id + "_blocking"), model); } - var properties = java.util.Map.of( - Direction.NORTH, BlockStateProperties.NORTH, - Direction.EAST, BlockStateProperties.EAST, - Direction.SOUTH, BlockStateProperties.SOUTH, - Direction.WEST, BlockStateProperties.WEST); - var directions = java.util.List.of(Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST); - var builder = getMultipartBuilder(bars); - builder.part().modelFile(ends).addModel().end(); - - // Iron bars use a centre post only when isolated, and a cap only at a loose end. - // The generic pane layout draws these faces over the connecting sides. - var isolatedPost = builder.part().modelFile(existing(id + "_post")).addModel(); - for (Direction direction : directions) { - isolatedPost.condition(properties.get(direction), false); + if (ModContent.fluids().containsKey(id)) { + String texture = id.equals("mercury") ? "mercury_still" : "molten_metal_still"; + save(cache, object("parent", "minecraft:item/generated", + "textures", object("layer0", "basemetals:block/" + texture)), + "models/item/" + id + ".json"); } - isolatedPost.end(); - for (Direction direction : directions) { - boolean alternate = direction == Direction.SOUTH || direction == Direction.WEST; - int rotation = direction.getAxis() == Direction.Axis.X ? 90 : 0; - var cap = builder.part().modelFile(existing(id + (alternate ? "_cap_alt" : "_cap"))) - .rotationY(rotation).addModel(); + if (id.endsWith("_bucket")) { + String fluidName = id.substring(0, id.length() - 7); + + // Keep the bucket and its fluid on one atlas. The aliases still use resource-pack textures. + save(cache, object("parent", "forge:item/bucket", "fluid", "basemetals:" + fluidName, + "loader", "forge:fluid_container", "textures", object( + "base", "basemetals:block/bucket_base", + "fluid", "basemetals:block/bucket_fluid", + "cover", "basemetals:block/bucket_cover", + "particle", "#base")), "models/item/" + id + ".json"); + int colour = ((MetalFluidType) ModContent.fluids().get(fluidName) + .source().get().getFluidType()).colour(); + JsonArray tints = new JsonArray(); + tints.add(object("type", "minecraft:constant", "value", -1)); + tints.add(object("type", "minecraft:constant", "value", 0xFF000000 | colour)); + tints.add(object("type", "minecraft:constant", "value", -1)); + model.add("tints", tints); + } - for (Direction connection : directions) { - cap.condition(properties.get(connection), connection == direction); - } - cap.end(); + save(cache, object("model", model), "items/" + id + ".json"); + } + } - builder.part().modelFile(existing(id + (alternate ? "_side_alt" : "_side"))) - .rotationY(rotation).addModel() - .condition(properties.get(direction), true).end(); + private void writeEquipment(CachedOutput cache) throws IOException { + var materials = new java.util.TreeSet(); + for (var entry : ModContent.itemsById().values()) { + if (entry.get() instanceof MaterialItems.Armor armor) { + materials.add(armor.baseMetalsMaterial().name()); } } - private static String baseName(String stairs) { - return stairs.substring(0, stairs.length() - "_stairs".length()); + for (String material : materials) { + JsonArray humanoid = new JsonArray(); + humanoid.add(object("texture", "basemetals:" + material)); + JsonArray leggings = new JsonArray(); + leggings.add(object("texture", "basemetals:" + material)); + JsonArray horse = new JsonArray(); + horse.add(object("texture", "basemetals:" + material)); + save(cache, object("layers", object("humanoid", humanoid, + "humanoid_leggings", leggings, "horse_body", horse)), + "equipment/" + material + ".json"); + + copyTexture(cache, "models/armor/" + material + "_layer_1.png", + "entity/equipment/humanoid/" + material + ".png"); + copyTexture(cache, "models/armor/" + material + "_layer_2.png", + "entity/equipment/humanoid_leggings/" + material + ".png"); + copyTexture(cache, "entity/horse/armor/horse_armor_" + material + ".png", + "entity/equipment/horse_body/" + material + ".png"); } } - /** Models for the few new/forwarded IDs not already present in the 1.12 assets. */ - private static final class Items extends ItemModelProvider { - private Items(net.minecraft.data.PackOutput generator, ExistingFileHelper helper) { - super(generator, BaseMetals.MOD_ID, helper); - } + private void copyTexture(CachedOutput cache, String source, String destination) throws IOException { + Path root = Path.of(System.getProperty("basemetals.projectDir")); + byte[] bytes = Files.readAllBytes(root.resolve("src/main/resources/assets/basemetals/textures/" + source)); + cache.writeIfNeeded(output.resolve("assets/basemetals/textures/" + destination), + bytes, com.google.common.hash.Hashing.sha1().hashBytes(bytes)); + } - @Override - protected void registerModels() { - MaterialCatalogue.ALL.stream().filter(material -> material.hasOre() && !material.name().equals("copper")) - .forEach(material -> basicFromTexture(material.name() + "_raw", material.name() + "_raw")); - for (String material : java.util.List.of("diamond", "gold", "iron")) { - basicFromTexture(material + "_blend", material + "_powder"); - basicFromTexture(material + "_smallblend", material + "_smallpowder"); - } + private static JsonObject model(String id) { + return object("type", "minecraft:model", "model", "basemetals:item/" + id); + } - ModContent.fluids().forEach((name, fluid) -> getBuilder(name + "_bucket") - .parent(getExistingFile(net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("forge", "item/bucket"))) - .customLoader(DynamicFluidContainerModelBuilder::begin) - .fluid(fluid.source().get())); + private static JsonObject condition(String property, JsonObject yes, JsonObject no) { + return object("type", "minecraft:condition", "property", property, "on_true", yes, "on_false", no); + } - ModContent.fluids().forEach((name, fluid) -> getBuilder(name) - .parent(getExistingFile(mcLoc("item/generated"))) - .texture("layer0", modLoc("block/" + (name.equals("mercury") - ? "mercury_still" : "molten_metal_still")))); - } + private void save(CachedOutput cache, JsonObject json, String path) { + writes.add(DataProvider.saveStable(cache, json, output.resolve("assets/basemetals/" + path))); + } - private void basicFromTexture(String id, String texture) { - getBuilder(id).parent(getExistingFile(mcLoc("item/generated"))) - .texture("layer0", modLoc("item/" + texture)); + static JsonObject object(Object... entries) { + JsonObject result = new JsonObject(); + for (int index = 0; index < entries.length; index += 2) { + String name = (String) entries[index]; + Object value = entries[index + 1]; + if (value instanceof com.google.gson.JsonElement json) result.add(name, json); + else if (value instanceof Number number) result.addProperty(name, number); + else if (value instanceof Boolean bool) result.addProperty(name, bool); + else result.addProperty(name, value.toString()); } + + return result; + } + + @Override + public String getName() { + return "Base Metals block and equipment assets"; } } 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 7191e70c6..b2eb923fe 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java @@ -26,17 +26,13 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; import net.minecraft.data.CachedOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ArmorItem; +import net.minecraft.resources.Identifier; 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 { @@ -71,6 +67,7 @@ final class GeneratedData implements DataProvider { private final Path output; private final Path legacyReference; private final List> pendingWrites = new ArrayList<>(); + private final Map scheduledResources = new LinkedHashMap<>(); GeneratedData(net.minecraft.data.PackOutput generator) { this.output = generator.getOutputFolder(); @@ -80,6 +77,7 @@ final class GeneratedData implements DataProvider { @Override public java.util.concurrent.CompletableFuture run(CachedOutput cache) { pendingWrites.clear(); + scheduledResources.clear(); try { writeFluidBlockstates(cache); writeLoot(cache); @@ -278,13 +276,13 @@ private void writeEnchantmentTags(CachedOutput cache) throws IOException { var item = registered.get(); String name = "basemetals:" + id; - if (item instanceof SwordItem) addAggregate(families, "swords", name); + if (item instanceof zone.moddev.mc.basemetals.content.MaterialItems.Sword) addAggregate(families, "swords", name); if (item instanceof AxeItem) addAggregate(families, "axes", name); - if (item instanceof PickaxeItem) addAggregate(families, "pickaxes", name); + if (item instanceof zone.moddev.mc.basemetals.content.MaterialItems.Pickaxe) addAggregate(families, "pickaxes", name); if (item instanceof ShovelItem) addAggregate(families, "shovels", name); if (item instanceof HoeItem) addAggregate(families, "hoes", name); - if (item instanceof DiggerItem) { + if (item instanceof zone.moddev.mc.basemetals.content.CrackhammerItem || item instanceof zone.moddev.mc.basemetals.content.ScytheItem || item instanceof zone.moddev.mc.basemetals.content.MaterialItems.Pickaxe || item instanceof AxeItem || item instanceof ShovelItem || item instanceof HoeItem) { addAggregate(families, "enchantable/mining", name); addAggregate(families, "enchantable/mining_loot", name); } else if (item instanceof ShearsItem) { @@ -298,12 +296,12 @@ private void writeEnchantmentTags(CachedOutput cache) throws IOException { 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"; + if (item instanceof zone.moddev.mc.basemetals.content.MaterialItems.Armor) { + String family = switch (item.components().get(net.minecraft.core.component.DataComponents.EQUIPPABLE).slot()) { + case HEAD -> "head_armor"; + case CHEST -> "chest_armor"; + case LEGS -> "leg_armor"; + case FEET -> "foot_armor"; default -> null; }; if (family != null) addAggregate(families, family, name); @@ -413,7 +411,7 @@ private void writeHarvestTierTags(CachedOutput cache) throws IOException { if (level < 1) return; content.blocks().values().stream() .map(net.minecraftforge.registries.RegistryObject::getId) - .map(ResourceLocation::toString) + .map(Identifier::toString) .forEach(byTier.get(level)::add); }); Map vanillaLevels = Map.of( @@ -438,13 +436,16 @@ private void writeHarvestTierTags(CachedOutput cache) throws IOException { } private void writeCompatibilityTags(CachedOutput cache) throws IOException { + tag(cache, "minecraft", "item/copper_tool_materials", List.of("#forge:ingots/copper")); + tag(cache, "minecraft", "item/repairs_copper_armor", List.of("#forge:ingots/copper")); + 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")) { + if (ModContent.blocksById().containsKey(entry.getKey().substring("basemetals:".length()))) { tag(cache, "forge", "block/" + tag, List.of(entry.getKey(), entry.getValue())); } } @@ -1613,7 +1614,7 @@ private void writeManifest(CachedOutput cache) throws IOException { JsonObject root = new JsonObject(); root.addProperty("format", 1); - root.addProperty("source", "Base Metals 1.21.1 catalogue"); + root.addProperty("source", "Base Metals 1.21.11 catalogue"); root.add("blocks", array(blocks)); root.add("items", array(items)); root.add("fluids", array(ModContent.fluids().keySet().stream().flatMap(id -> @@ -1654,7 +1655,16 @@ private void blockTag(CachedOutput cache, String family, String material, List values) throws IOException { - JsonObject root = new JsonObject(); root.addProperty("replace", false); root.add("values", array(values)); + var compatible = new java.util.TreeSet<>(values); + for (String value : values) { + if (namespace.equals("forge") && !value.startsWith("#")) { + compatible.add(VanillaCopper.output(value)); + } + } + + JsonObject root = new JsonObject(); + root.addProperty("replace", false); + root.add("values", array(List.copyOf(compatible))); save(cache, root, "data/" + namespace + "/tags/" + path + ".json"); } private void uncheckedTag(CachedOutput cache, String namespace, String path, List values) { @@ -1788,7 +1798,7 @@ private void save(CachedOutput cache, JsonObject value, String relative) throws 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)); + .getValue(Identifier.parse(result)); String category = switch (zone.moddev.mc.basemetals.ModTabs.category(item)) { case "blocks" -> "building"; case "tools", "combat" -> "equipment"; @@ -1801,7 +1811,15 @@ private void save(CachedOutput cache, JsonObject value, String relative) throws } 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))); + JsonObject previous = scheduledResources.putIfAbsent(relative, value.deepCopy()); + if (previous != null) { + if (!previous.equals(value)) { + throw new IllegalStateException("Conflicting generated resources: " + relative); + } + return; + } + + pendingWrites.add(DataProvider.saveStable(cache, value.deepCopy(), output.resolve(relative))); } private static JsonElement replaceCopperOutputs(JsonElement value) { @@ -1850,6 +1868,9 @@ private static void normalizeRecipeResults(JsonObject json) { } String type = json.has("type") ? json.get("type").getAsString() : ""; if (!type.startsWith("minecraft:") && !type.startsWith("basemetals:")) return; + for (String field : List.of("ingredient", "ingredients", "key", "plate")) { + if (json.has(field)) json.add(field, nativeIngredient(json.get(field))); + } if (!json.has("result")) return; JsonElement result = json.get("result"); @@ -1861,6 +1882,23 @@ private static void normalizeRecipeResults(JsonObject json) { } } + private static JsonElement nativeIngredient(JsonElement value) { + if (value.isJsonArray()) { + JsonArray result = new JsonArray(); + value.getAsJsonArray().forEach(entry -> result.add(nativeIngredient(entry))); + return result; + } + if (!value.isJsonObject()) return value; + + JsonObject object = value.getAsJsonObject(); + if (object.has("item")) return new com.google.gson.JsonPrimitive(object.get("item").getAsString()); + if (object.has("tag")) return new com.google.gson.JsonPrimitive("#" + object.get("tag").getAsString()); + + JsonObject result = new JsonObject(); + object.entrySet().forEach(entry -> result.add(entry.getKey(), nativeIngredient(entry.getValue()))); + return result; + } + private static void normalizePredicates(JsonElement value) { if (value.isJsonArray()) { value.getAsJsonArray().forEach(GeneratedData::normalizePredicates); diff --git a/src/dataGenerator/resources/datagen/templates/block/bars_post_ends.json b/src/dataGenerator/resources/datagen/templates/block/bars_post_ends.json new file mode 100644 index 000000000..694ac280b --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/bars_post_ends.json @@ -0,0 +1,49 @@ +{ + "ambientocclusion": false, + "elements": [ + { + "faces": { + "down": { + "texture": "#edge" + }, + "up": { + "texture": "#edge" + } + }, + "from": [ + 7, + 0.001, + 7 + ], + "to": [ + 9, + 0.001, + 9 + ] + }, + { + "faces": { + "down": { + "texture": "#edge" + }, + "up": { + "texture": "#edge" + } + }, + "from": [ + 7, + 15.999, + 7 + ], + "to": [ + 9, + 15.999, + 9 + ] + } + ], + "textures": { + "edge": "basemetals:block/copper_bars", + "particle": "basemetals:block/copper_bars" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_bottom_left.json b/src/dataGenerator/resources/datagen/templates/block/door_bottom_left.json new file mode 100644 index 000000000..1dc4234dc --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_bottom_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_bottom_left_open.json b/src/dataGenerator/resources/datagen/templates/block/door_bottom_left_open.json new file mode 100644 index 000000000..07b6a22fc --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_bottom_right.json b/src/dataGenerator/resources/datagen/templates/block/door_bottom_right.json new file mode 100644 index 000000000..696a49bc2 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_bottom_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_bottom_right_open.json b/src/dataGenerator/resources/datagen/templates/block/door_bottom_right_open.json new file mode 100644 index 000000000..f419fd8b3 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_top_left.json b/src/dataGenerator/resources/datagen/templates/block/door_top_left.json new file mode 100644 index 000000000..c863f823d --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_top_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_top_left_open.json b/src/dataGenerator/resources/datagen/templates/block/door_top_left_open.json new file mode 100644 index 000000000..444a522ed --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_top_right.json b/src/dataGenerator/resources/datagen/templates/block/door_top_right.json new file mode 100644 index 000000000..8dfd64abb --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_top_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/door_top_right_open.json b/src/dataGenerator/resources/datagen/templates/block/door_top_right_open.json new file mode 100644 index 000000000..6181b954c --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "basemetals:block/copper_door_lower", + "top": "basemetals:block/copper_door_upper" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/block/wall_side_tall.json b/src/dataGenerator/resources/datagen/templates/block/wall_side_tall.json new file mode 100644 index 000000000..57a78e1e8 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/block/wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "basemetals:block/copper_block" + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/anvil.json b/src/dataGenerator/resources/datagen/templates/blockstates/anvil.json new file mode 100644 index 000000000..5bc15a555 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/anvil.json @@ -0,0 +1,49 @@ +{ + "variants": { + "damage=0,facing=east": { + "model": "basemetals:block/steel_anvil_undamaged", + "y": 270 + }, + "damage=0,facing=north": { + "model": "basemetals:block/steel_anvil_undamaged", + "y": 180 + }, + "damage=0,facing=south": { + "model": "basemetals:block/steel_anvil_undamaged" + }, + "damage=0,facing=west": { + "model": "basemetals:block/steel_anvil_undamaged", + "y": 90 + }, + "damage=1,facing=east": { + "model": "basemetals:block/steel_anvil_slightly_damaged", + "y": 270 + }, + "damage=1,facing=north": { + "model": "basemetals:block/steel_anvil_slightly_damaged", + "y": 180 + }, + "damage=1,facing=south": { + "model": "basemetals:block/steel_anvil_slightly_damaged" + }, + "damage=1,facing=west": { + "model": "basemetals:block/steel_anvil_slightly_damaged", + "y": 90 + }, + "damage=2,facing=east": { + "model": "basemetals:block/steel_anvil_very_damaged", + "y": 270 + }, + "damage=2,facing=north": { + "model": "basemetals:block/steel_anvil_very_damaged", + "y": 180 + }, + "damage=2,facing=south": { + "model": "basemetals:block/steel_anvil_very_damaged" + }, + "damage=2,facing=west": { + "model": "basemetals:block/steel_anvil_very_damaged", + "y": 90 + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/bars.json b/src/dataGenerator/resources/datagen/templates/blockstates/bars.json new file mode 100644 index 000000000..3d1d18c7a --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/bars.json @@ -0,0 +1,100 @@ +{ + "multipart": [ + { + "apply": { + "model": "basemetals:block/copper_bars_post_ends" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_post" + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_cap" + }, + "when": { + "east": "false", + "north": "true", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_cap", + "y": 90 + }, + "when": { + "east": "true", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_cap_alt" + }, + "when": { + "east": "false", + "north": "false", + "south": "true", + "west": "false" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_cap_alt", + "y": 90 + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "true" + } + }, + { + "apply": { + "model": "basemetals:block/copper_bars_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/block.json b/src/dataGenerator/resources/datagen/templates/blockstates/block.json new file mode 100644 index 000000000..f3a3d11d5 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "basemetals:block/copper_block" + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/button.json b/src/dataGenerator/resources/datagen/templates/blockstates/button.json new file mode 100644 index 000000000..e81a3b00d --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/copper_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/copper_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/copper_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/copper_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/copper_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/copper_button" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/copper_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/copper_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/copper_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/copper_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/copper_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/copper_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/copper_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/copper_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/door.json b/src/dataGenerator/resources/datagen/templates/blockstates/door.json new file mode 100644 index 000000000..5ce78a611 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "basemetals:block/copper_door_bottom_left" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "basemetals:block/copper_door_bottom_left_open", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "basemetals:block/copper_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "basemetals:block/copper_door_bottom_right_open", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "basemetals:block/copper_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "basemetals:block/copper_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "basemetals:block/copper_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "basemetals:block/copper_door_top_right_open", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "basemetals:block/copper_door_bottom_left", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "basemetals:block/copper_door_bottom_left_open" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "basemetals:block/copper_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "basemetals:block/copper_door_bottom_right_open", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "basemetals:block/copper_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "basemetals:block/copper_door_top_left_open" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "basemetals:block/copper_door_top_right", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "basemetals:block/copper_door_top_right_open", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "basemetals:block/copper_door_bottom_left", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "basemetals:block/copper_door_bottom_left_open", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "basemetals:block/copper_door_bottom_right", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "basemetals:block/copper_door_bottom_right_open" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "basemetals:block/copper_door_top_left", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "basemetals:block/copper_door_top_left_open", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "basemetals:block/copper_door_top_right", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "basemetals:block/copper_door_top_right_open" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "basemetals:block/copper_door_bottom_left", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "basemetals:block/copper_door_bottom_left_open", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "basemetals:block/copper_door_bottom_right", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "basemetals:block/copper_door_bottom_right_open", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "basemetals:block/copper_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "basemetals:block/copper_door_top_left_open", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "basemetals:block/copper_door_top_right", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "basemetals:block/copper_door_top_right_open", + "y": 90 + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/human_detector.json b/src/dataGenerator/resources/datagen/templates/blockstates/human_detector.json new file mode 100644 index 000000000..b921567b9 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/human_detector.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "basemetals:block/human_detector_up" + }, + "powered=true": { + "model": "basemetals:block/human_detector_down" + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/lever.json b/src/dataGenerator/resources/datagen/templates/blockstates/lever.json new file mode 100644 index 000000000..2e9ee70c9 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/lever.json @@ -0,0 +1,76 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=ceiling,facing=east,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=ceiling,facing=north,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=ceiling,facing=north,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=ceiling,facing=south,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=ceiling,facing=south,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=ceiling,facing=west,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=ceiling,facing=west,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=floor,facing=east,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=floor,facing=east,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=floor,facing=north,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=floor,facing=north,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=floor,facing=south,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=floor,facing=south,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=floor,facing=west,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=floor,facing=west,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=wall,facing=east,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=wall,facing=east,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=wall,facing=north,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=wall,facing=north,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=wall,facing=south,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=wall,facing=south,powered=true": { + "model": "basemetals:block/copper_lever" + }, + "face=wall,facing=west,powered=false": { + "model": "basemetals:block/copper_lever_off" + }, + "face=wall,facing=west,powered=true": { + "model": "basemetals:block/copper_lever" + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/plate.json b/src/dataGenerator/resources/datagen/templates/blockstates/plate.json new file mode 100644 index 000000000..c4d8d98c6 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/plate.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "basemetals:block/copper_plate", + "x": 90 + }, + "facing=east": { + "model": "basemetals:block/copper_plate", + "y": 90 + }, + "facing=north": { + "model": "basemetals:block/copper_plate" + }, + "facing=south": { + "model": "basemetals:block/copper_plate", + "y": 180 + }, + "facing=up": { + "model": "basemetals:block/copper_plate", + "x": 270 + }, + "facing=west": { + "model": "basemetals:block/copper_plate", + "y": 270 + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/pressure_plate.json b/src/dataGenerator/resources/datagen/templates/blockstates/pressure_plate.json new file mode 100644 index 000000000..56379721d --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "basemetals:block/copper_pressure_plate_up" + }, + "powered=true": { + "model": "basemetals:block/copper_pressure_plate_down" + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/slab.json b/src/dataGenerator/resources/datagen/templates/blockstates/slab.json new file mode 100644 index 000000000..5235df141 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "basemetals:block/half_slab_copper" + }, + "type=double": { + "model": "basemetals:block/copper_block" + }, + "type=top": { + "model": "basemetals:block/upper_slab_copper" + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/stairs.json b/src/dataGenerator/resources/datagen/templates/blockstates/stairs.json new file mode 100644 index 000000000..3cdf22cd1 --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "basemetals:block/copper_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "basemetals:block/copper_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "basemetals:block/copper_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "basemetals:block/copper_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/trapdoor.json b/src/dataGenerator/resources/datagen/templates/blockstates/trapdoor.json new file mode 100644 index 000000000..53849fadb --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "basemetals:block/copper_trapdoor_bottom", + "y": 90 + }, + "facing=east,half=bottom,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "basemetals:block/copper_trapdoor_top", + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=false": { + "model": "basemetals:block/copper_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "basemetals:block/copper_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "basemetals:block/copper_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=bottom,open=false": { + "model": "basemetals:block/copper_trapdoor_bottom", + "y": 180 + }, + "facing=south,half=bottom,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "basemetals:block/copper_trapdoor_top", + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "basemetals:block/copper_trapdoor_bottom", + "y": 270 + }, + "facing=west,half=bottom,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "basemetals:block/copper_trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { + "model": "basemetals:block/copper_trapdoor_open", + "x": 180, + "y": 90 + } + } +} diff --git a/src/dataGenerator/resources/datagen/templates/blockstates/wall.json b/src/dataGenerator/resources/datagen/templates/blockstates/wall.json new file mode 100644 index 000000000..f912646aa --- /dev/null +++ b/src/dataGenerator/resources/datagen/templates/blockstates/wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "basemetals:block/copper_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "basemetals:block/copper_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/src/gametest/java/zone/moddev/mc/basemetals/GameTestRegistration.java b/src/gametest/java/zone/moddev/mc/basemetals/GameTestRegistration.java new file mode 100644 index 000000000..3ba3bbabf --- /dev/null +++ b/src/gametest/java/zone/moddev/mc/basemetals/GameTestRegistration.java @@ -0,0 +1,63 @@ +package zone.moddev.mc.basemetals; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Locale; + +import net.minecraft.core.registries.Registries; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.resources.Identifier; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.gametest.GameTest; +import net.minecraftforge.registries.RegisterEvent; +import zone.moddev.mc.basemetals.compat.CompatibilityRecipeGameTests; +import zone.moddev.mc.basemetals.content.BaseMetalsGameTests; +import zone.moddev.mc.basemetals.content.ForwardPortGameTests; +import zone.moddev.mc.basemetals.content.NativeComponentGameTests; +import zone.moddev.mc.basemetals.migration.MigrationGameTests; + +/** Registers the isolated tests in Minecraft's native test-function registry. */ +@Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public final class GameTestRegistration { + private GameTestRegistration() {} + + @SubscribeEvent + public static void register(RegisterEvent event) { + event.register(Registries.TEST_FUNCTION, registry -> { + NativeComponentGameTests.registerCapabilityProbe(); + int count = 0; + + for (Class testClass : List.of(BaseMetalsGameTests.class, ForwardPortGameTests.class, + NativeComponentGameTests.class, MigrationGameTests.class, CompatibilityRecipeGameTests.class)) { + for (Method method : testClass.getDeclaredMethods()) { + if (!method.isAnnotationPresent(GameTest.class)) continue; + + String name = method.getName().replaceAll("([A-Z])", "_$1").toLowerCase(Locale.ROOT); + registry.register(Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, name), + helper -> run(method, helper)); + count++; + } + } + + if (count != 46) { + throw new IllegalStateException("Expected 46 Base Metals GameTests, found " + count); + } + }); + } + + private static void run(Method method, GameTestHelper helper) { + try { + method.invoke(null, helper); + } catch (InvocationTargetException exception) { + Throwable cause = exception.getCause(); + if (cause instanceof RuntimeException failure) throw failure; + if (cause instanceof Error failure) throw failure; + + throw new IllegalStateException("GameTest failed: " + method.getName(), cause); + } catch (ReflectiveOperationException exception) { + throw new IllegalStateException("Could not invoke GameTest " + method.getName(), exception); + } + } +} diff --git a/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java index b71f94bf1..48337cb14 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java @@ -2,31 +2,31 @@ import zone.moddev.mc.basemetals.BaseMetals; -import net.minecraft.gametest.framework.GameTest; +import net.minecraftforge.gametest.GameTest; import net.minecraft.gametest.framework.GameTestHelper; -import net.minecraftforge.gametest.GameTestHolder; +import net.minecraftforge.gametest.GameTestNamespace; import net.minecraftforge.gametest.GameTestDontPrefix; import net.minecraftforge.fml.ModList; /** Proves optional-mod serializers accept every packaged compatibility recipe. */ -@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestNamespace(BaseMetals.MOD_ID) @GameTestDontPrefix public final class CompatibilityRecipeGameTests { - private static final String EMPTY = "empty"; + private static final String EMPTY = "basemetals:empty"; private CompatibilityRecipeGameTests() {} - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void thermalRecipesLoadWhenInstalled(GameTestHelper helper) { requireRecipeCount(helper, "thermal_expansion", "thermal", 130L); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void tinkersConstructRecipesLoadWhenInstalled(GameTestHelper helper) { requireRecipeCount(helper, "tconstruct", "tconstruct", 472L); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void enderIoRecipesLoadWhenInstalled(GameTestHelper helper) { requireRecipeCount(helper, "enderio", "enderio", 44L); } @@ -39,9 +39,9 @@ private static void requireRecipeCount(GameTestHelper helper, String modId, } String pathPrefix = "compat/" + recipeFolder + "/"; - long actual = helper.getLevel().getRecipeManager().getRecipes().stream() - .filter(recipe -> recipe.id().getNamespace().equals(BaseMetals.MOD_ID)) - .filter(recipe -> recipe.id().getPath().startsWith(pathPrefix)) + long actual = helper.getLevel().getServer().getRecipeManager().getRecipes().stream() + .filter(recipe -> recipe.id().identifier().getNamespace().equals(BaseMetals.MOD_ID)) + .filter(recipe -> recipe.id().identifier().getPath().startsWith(pathPrefix)) .count(); if (actual != expected) { helper.fail("Expected " + expected + " live " + modId 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 4a1f20b96..e736800f6 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java @@ -23,12 +23,12 @@ import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; import net.minecraft.core.Registry; -import net.minecraft.gametest.framework.GameTest; +import net.minecraftforge.gametest.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; @@ -59,8 +59,8 @@ import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.entity.npc.VillagerTrades.ItemListing; +import net.minecraft.world.entity.npc.villager.VillagerProfession; +import net.minecraft.world.entity.npc.villager.VillagerTrades.ItemListing; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; @@ -77,26 +77,19 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.event.village.VillagerTradesEvent; -import net.minecraftforge.gametest.GameTestHolder; +import net.minecraftforge.gametest.GameTestNamespace; import net.minecraftforge.gametest.GameTestDontPrefix; import net.minecraftforge.registries.ForgeRegistries; /** Server-lifecycle checks which cannot safely run in a plain JUnit JVM. */ -@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestNamespace(BaseMetals.MOD_ID) @GameTestDontPrefix public final class BaseMetalsGameTests { - private static final String EMPTY = "empty"; + private static final String EMPTY = "basemetals:empty"; private BaseMetalsGameTests() {} - @net.minecraft.gametest.framework.BeforeBatch(batch = BaseMetals.MOD_ID) - public static void loadServerConfiguration(net.minecraft.server.level.ServerLevel level) { - net.minecraftforge.fml.config.ConfigTracker.INSTANCE.loadConfigs( - net.minecraftforge.fml.config.ModConfig.Type.SERVER, - level.getServer().getWorldPath(new net.minecraft.world.level.storage.LevelResource("serverconfig"))); - } - - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void platesUseTheClickedFaceAndEdge(GameTestHelper helper) { PlateBlock plate = (PlateBlock) ModContent.blocksById().get("copper_plate").get(); Player player = helper.makeMockPlayer(GameType.SURVIVAL); @@ -142,7 +135,7 @@ Direction.WEST, new AABB(15.0D / 16.0D, 0, 0, 1, 1, 1), helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void humanDetectorIgnoresNonPlayers(GameTestHelper helper) { HumanDetectorBlock detector = (HumanDetectorBlock) ModContent.HUMAN_DETECTOR.get(); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); @@ -151,7 +144,7 @@ public static void humanDetectorIgnoresNonPlayers(GameTestHelper helper) { "Human detector responded to a non-player entity"); Player player = helper.makeMockPlayer(GameType.SURVIVAL); - player.moveTo(position.getX() + 0.5D, position.getY() + 0.1D, position.getZ() + 0.5D); + player.snapTo(position.getX() + 0.5D, position.getY() + 0.1D, position.getZ() + 0.5D); helper.getLevel().addFreshEntity(player); require(helper, detector.getSignalStrength(helper.getLevel(), position) == 15, "Human detector did not respond to a player"); @@ -159,30 +152,30 @@ public static void humanDetectorIgnoresNonPlayers(GameTestHelper helper) { helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void compatibilitySlabsStayDoubleAndHidden(GameTestHelper helper) { for (String id : ModContent.hiddenBlocks()) { BlockState state = ModContent.blocksById().get(id).get().defaultBlockState(); require(helper, state.getValue(CompatibilityDoubleSlabBlock.TYPE) == SlabType.DOUBLE, id + " did not default to a double slab"); - require(helper, !ForgeRegistries.ITEMS.containsKey(ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), + require(helper, !ForgeRegistries.ITEMS.containsKey(Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " unexpectedly has a block item"); } helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void everyFluidHasSourceFlowingBlockAndBucket(GameTestHelper helper) { BlockPos position = helper.absolutePos(new BlockPos(2, 1, 2)); ModContent.fluids().forEach((id, fluid) -> { require(helper, ForgeRegistries.FLUIDS.getKey(fluid.source().get()).equals( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " source fluid is not registered correctly"); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " source fluid is not registered correctly"); require(helper, ForgeRegistries.FLUIDS.getKey(fluid.flowing().get()).equals( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "flowing_" + id)), id + " flowing fluid is not registered correctly"); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, "flowing_" + id)), id + " flowing fluid is not registered correctly"); require(helper, ForgeRegistries.BLOCKS.getKey(fluid.block().get()).equals( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " fluid block is not registered correctly"); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " fluid block is not registered correctly"); require(helper, ForgeRegistries.ITEMS.getKey(fluid.bucket().get()).equals( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id + "_bucket")), id + " bucket is not registered correctly"); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, id + "_bucket")), id + " bucket is not registered correctly"); require(helper, fluid.bucket().get() instanceof BaseMetalBucketItem, id + " does not use the visible functional bucket implementation"); @@ -203,7 +196,7 @@ public static void everyFluidHasSourceFlowingBlockAndBucket(GameTestHelper helpe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void crushingRecipesLoadAndMatchOre(GameTestHelper helper) { MaterialCatalogue.ALL.stream().filter(material -> material.hasOre()).forEach(material -> assertCrushingRecipe(helper, ModContent.item(material.name() + "_ore").get().getDefaultInstance(), @@ -231,7 +224,7 @@ public static void crushingRecipesLoadAndMatchOre(GameTestHelper helper) { helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void legacyFurnaceRecipesLoadAndRetainCountedOutputs(GameTestHelper helper) { MaterialCatalogue.ALL.forEach(material -> { assertSmeltingRecipeInTag(helper, @@ -267,19 +260,19 @@ public static void legacyFurnaceRecipesLoadAndRetainCountedOutputs(GameTestHelpe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void stoneCrackhammerCraftsFromTheLegacyMiddleColumnPattern(GameTestHelper helper) { CraftingContainer crafting = craftingContainer(3, 3); crafting.setItem(1, new ItemStack(Blocks.STONE_BRICKS)); crafting.setItem(4, new ItemStack(Items.STICK)); crafting.setItem(7, new ItemStack(Items.STICK)); - var recipe = helper.getLevel().getRecipeManager().getRecipeFor( + var recipe = helper.getLevel().getServer().getRecipeManager().getRecipeFor( 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")), + require(helper, recipe.orElseThrow().id().identifier().equals( + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, "stone_crackhammer")), "The legacy stone crackhammer pattern matched the wrong recipe"); ItemStack output = recipe.orElseThrow().value().assemble(crafting.asCraftInput(), net.minecraft.core.RegistryAccess.EMPTY); require(helper, output.is(ModContent.item("stone_crackhammer").get()), @@ -287,7 +280,7 @@ public static void stoneCrackhammerCraftsFromTheLegacyMiddleColumnPattern(GameTe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY, timeoutTicks = 250) + @GameTest(structure = EMPTY, maxTicks = 250) public static void furnaceProcessesDustAndCountedLegacyRecovery(GameTestHelper helper) { BlockPos ironFurnacePosition = new BlockPos(1, 1, 1); BlockPos recoveryFurnacePosition = new BlockPos(2, 1, 1); @@ -295,12 +288,12 @@ public static void furnaceProcessesDustAndCountedLegacyRecovery(GameTestHelper h helper.setBlock(recoveryFurnacePosition, Blocks.FURNACE); AbstractFurnaceBlockEntity ironFurnace = (AbstractFurnaceBlockEntity) - helper.getBlockEntity(ironFurnacePosition); + helper.getBlockEntity(ironFurnacePosition, AbstractFurnaceBlockEntity.class); ironFurnace.setItem(0, ModContent.item("iron_powder").get().getDefaultInstance()); ironFurnace.setItem(1, new ItemStack(Items.COAL)); AbstractFurnaceBlockEntity recoveryFurnace = (AbstractFurnaceBlockEntity) - helper.getBlockEntity(recoveryFurnacePosition); + helper.getBlockEntity(recoveryFurnacePosition, AbstractFurnaceBlockEntity.class); recoveryFurnace.setItem(0, ModContent.item("tin_crossbow").get().getDefaultInstance()); recoveryFurnace.setItem(1, new ItemStack(Items.COAL)); @@ -313,7 +306,7 @@ public static void furnaceProcessesDustAndCountedLegacyRecovery(GameTestHelper h }); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void crackhammerBreaksOreIntoFixedOutput(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack hammer = ModContent.item("stone_crackhammer").get().getDefaultInstance(); @@ -323,17 +316,17 @@ public static void crackhammerBreaksOreIntoFixedOutput(GameTestHelper helper) { helper.setBlock(relativePosition, Blocks.IRON_ORE); BlockState state = helper.getLevel().getBlockState(position); - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(helper.getLevel(), position, state, player); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(helper.getLevel(), position, state, player, net.minecraftforge.common.util.Result.DEFAULT); new BaseMetalsEvents().onBreak(event); - require(helper, event.isCanceled(), "Crackhammer did not replace the vanilla ore break"); + require(helper, event.getResult().isDenied(), "Crackhammer did not replace the vanilla ore break"); require(helper, helper.getLevel().getBlockState(position).isAir(), "Crackhammer did not remove the ore"); require(helper, hammer.getDamageValue() == 1, "Crackhammer was not damaged exactly once"); requireSingleDrop(helper, position, null, "iron_powder", 2); helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void crackhammerGroundCrushingUsesOneItemPerNormalUse(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack hammer = ModContent.item("stone_crackhammer").get().getDefaultInstance(); @@ -357,7 +350,7 @@ public static void crackhammerGroundCrushingUsesOneItemPerNormalUse(GameTestHelp helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void groundHammeringRawMetalsProducesOnePowder(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); @@ -390,7 +383,7 @@ public static void groundHammeringRawMetalsProducesOnePowder(GameTestHelper help helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void scytheHarvestsHorizontalThreeByThreeAndPaysDurability(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack scythe = ModContent.item("iron_scythe").get().getDefaultInstance(); @@ -420,7 +413,7 @@ public static void scytheHarvestsHorizontalThreeByThreeAndPaysDurability(GameTes helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void legacyToolAttributesAndFuelValuesSurviveThePort(GameTestHelper helper) { var bronze = MaterialCatalogue.get("bronze"); ItemStack hoe = ModContent.item("bronze_hoe").get().getDefaultInstance(); @@ -466,7 +459,7 @@ public static void legacyToolAttributesAndFuelValuesSurviveThePort(GameTestHelpe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void crackhammerUsesLegacySpeedForEveryHarvestableCrushingInput(GameTestHelper helper) { ItemStack stoneHammer = ModContent.item("stone_crackhammer").get().getDefaultInstance(); float expected = ((MaterialBacked) stoneHammer.getItem()).baseMetalsMaterial() @@ -482,7 +475,7 @@ public static void crackhammerUsesLegacySpeedForEveryHarvestableCrushingInput(Ga helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void legacyBlockCapabilitiesSoundsAndQuartzInteractionSurvive(GameTestHelper helper) { MaterialCatalogue.ALL.stream().filter(material -> material.hasEquipment()).forEach(material -> require(helper, ModContent.blocksById().get(material.name() + "_block").get() @@ -526,12 +519,12 @@ public static void legacyBlockCapabilitiesSoundsAndQuartzInteractionSurvive(Game helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void customAnvilMenusRemainValidWithoutTheVanillaAnvilTag(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); BlockPos relative = new BlockPos(1, 1, 3); BlockPos position = helper.absolutePos(relative); - player.moveTo(position, 0.0F, 0.0F); + player.snapTo(position, 0.0F, 0.0F); int containerId = 1; for (String id : List.of("stone_anvil", "steel_anvil", "adamantine_anvil")) { @@ -560,14 +553,54 @@ public static void customAnvilMenusRemainValidWithoutTheVanillaAnvilTag(GameTest helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) + public static void customAnvilsWearWithoutChangingTheirSavedIdentity(GameTestHelper helper) { + ServerPlayer player = survivalPlayer(helper); + BlockPos relative = new BlockPos(1, 1, 1); + BlockPos position = helper.absolutePos(relative); + helper.setBlock(relative.below(), Blocks.STONE); + + for (String id : List.of("stone_anvil", "steel_anvil", "adamantine_anvil")) { + var anvil = (BaseMetalAnvilBlock) ModContent.blocksById().get(id).get(); + + for (int damage = 0; damage < 3; damage++) { + BlockState before = anvil.defaultBlockState().setValue(BaseMetalAnvilBlock.DAMAGE, damage); + helper.getLevel().setBlock(position, before, 3); + var menu = anvil.getMenuProvider(before, helper.getLevel(), position) + .createMenu(1, player.getInventory(), player); + ItemStack sword = Items.IRON_SWORD.getDefaultInstance(); + sword.setDamageValue(80); + menu.getSlot(0).set(sword); + menu.getSlot(1).set(Items.IRON_INGOT.getDefaultInstance()); + ItemStack repaired = menu.getSlot(2).getItem().copy(); + require(helper, !repaired.isEmpty(), "No anvil repair result for " + id); + + // Use a known wear roll rather than waiting for a random break. + player.getRandom().setSeed(4096L); + require(helper, player.getRandom().nextFloat() < 0.12F, "The fixed anvil roll changed"); + player.getRandom().setSeed(4096L); + player.experienceLevel = 1000; + menu.getSlot(2).onTake(player, repaired); + + BlockState after = helper.getLevel().getBlockState(position); + require(helper, damage == 2 ? after.isAir() + : after.is(anvil) && after.getValue(BaseMetalAnvilBlock.DAMAGE) == damage + 1, + id + " did not advance its saved damage state from " + damage); + menu.removed(player); + } + } + + helper.succeed(); + } + + @GameTest(structure = EMPTY) public static void smithsRetainTheLegacyMercuryIngotSale(GameTestHelper helper) { Int2ObjectOpenHashMap> trades = new Int2ObjectOpenHashMap<>(); for (int level = 1; level <= 5; level++) trades.put(level, new ArrayList<>()); BaseMetalsTrades.add(new VillagerTradesEvent(trades, VillagerProfession.ARMORER)); - var trader = EntityType.VILLAGER.create(helper.getLevel()); + var trader = EntityType.VILLAGER.create(helper.getLevel(), net.minecraft.world.entity.EntitySpawnReason.COMMAND); boolean found = trades.values().stream().flatMap(List::stream) - .map(listing -> listing.getOffer(trader, net.minecraft.util.RandomSource.create(0L))) + .map(listing -> listing.getOffer(helper.getLevel(), trader, net.minecraft.util.RandomSource.create(0L))) .anyMatch(offer -> offer != null && offer.getResult().is(ModContent.item("mercury_ingot").get()) && offer.getResult().getCount() == 12); @@ -575,7 +608,7 @@ public static void smithsRetainTheLegacyMercuryIngotSale(GameTestHelper helper) helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void creativeTabsRetainTheirLegacyStarsteelIcons(GameTestHelper helper) { require(helper, ModTabs.BLOCKS.get().getIconItem().is(ModContent.item("starsteel_block").get()), "Blocks tab did not retain the Starsteel block icon"); @@ -588,10 +621,12 @@ public static void creativeTabsRetainTheirLegacyStarsteelIcons(GameTestHelper he helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper helper) { - var recipe = helper.getLevel().getRecipeManager().byKey( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "adamantine_chestplate_plate_repair")); + var recipeKey = net.minecraft.resources.ResourceKey.create( + net.minecraft.core.registries.Registries.RECIPE, + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, "adamantine_chestplate_plate_repair")); + var recipe = helper.getLevel().getServer().getRecipeManager().byKey(recipeKey); require(helper, recipe.isPresent(), "Adamantine chestplate plate-repair recipe did not load"); if (recipe.isEmpty()) return; @@ -618,12 +653,12 @@ public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper hel 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"), + require(helper, output.getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getBooleanOr("LegacyCustomData", false), "Plate repair lost custom item data"); helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsItemData(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack shield = ModContent.item("copper_shield").get().getDefaultInstance(); @@ -652,7 +687,7 @@ public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsItemData(GameTe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void bowsAndLegacyCrossbowsUseOnlyTheirOwnAmmunition(GameTestHelper helper) { MaterialItems.Bow bow = (MaterialItems.Bow) ModContent.item("tin_bow").get(); MaterialItems.Crossbow crossbow = (MaterialItems.Crossbow) ModContent.item("tin_crossbow").get(); @@ -670,7 +705,7 @@ public static void bowsAndLegacyCrossbowsUseOnlyTheirOwnAmmunition(GameTestHelpe "Legacy crossbow accepted an arrow"); ServerPlayer player = survivalPlayer(helper); - player.moveTo(helper.absolutePos(new BlockPos(1, 2, 1)), 0.0F, 0.0F); + player.snapTo(helper.absolutePos(new BlockPos(1, 2, 1)), 0.0F, 0.0F); ItemStack weapon = crossbow.getDefaultInstance(); player.setItemInHand(InteractionHand.MAIN_HAND, weapon); player.getInventory().setItem(1, bolt.copy()); @@ -702,7 +737,7 @@ public static void bowsAndLegacyCrossbowsUseOnlyTheirOwnAmmunition(GameTestHelpe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void vanillaBitsEquipmentUsesItsActualMaterialForAnvilRepair(GameTestHelper helper) { ItemStack diamondBow = ModContent.item("diamond_bow").get().getDefaultInstance(); ItemStack emeraldSword = ModContent.item("emerald_sword").get().getDefaultInstance(); @@ -710,32 +745,32 @@ public static void vanillaBitsEquipmentUsesItsActualMaterialForAnvilRepair(GameT ItemStack stoneScythe = ModContent.item("stone_scythe").get().getDefaultInstance(); ItemStack woodScythe = ModContent.item("wood_scythe").get().getDefaultInstance(); - require(helper, diamondBow.getItem().isValidRepairItem(diamondBow, new ItemStack(Items.DIAMOND)), + require(helper, diamondBow.isValidRepairItem(new ItemStack(Items.DIAMOND)), "Diamond bow rejected a diamond repair ingredient"); - require(helper, emeraldSword.getItem().isValidRepairItem(emeraldSword, new ItemStack(Items.EMERALD)), + require(helper, emeraldSword.isValidRepairItem(new ItemStack(Items.EMERALD)), "Emerald sword rejected an emerald repair ingredient"); - require(helper, quartzArmor.getItem().isValidRepairItem(quartzArmor, new ItemStack(Items.QUARTZ)), + require(helper, quartzArmor.isValidRepairItem(new ItemStack(Items.QUARTZ)), "Quartz armor rejected a quartz repair ingredient"); - require(helper, stoneScythe.getItem().isValidRepairItem(stoneScythe, new ItemStack(Blocks.STONE)), + require(helper, stoneScythe.isValidRepairItem(new ItemStack(Blocks.STONE)), "Stone scythe rejected a stone repair ingredient"); - require(helper, woodScythe.getItem().isValidRepairItem(woodScythe, new ItemStack(Blocks.OAK_PLANKS)), + require(helper, woodScythe.isValidRepairItem(new ItemStack(Blocks.OAK_PLANKS)), "Wood scythe rejected a plank repair ingredient"); - require(helper, !diamondBow.getItem().isValidRepairItem(diamondBow, new ItemStack(Items.IRON_INGOT)), + require(helper, !diamondBow.isValidRepairItem(new ItemStack(Items.IRON_INGOT)), "Diamond bow accepted an unrelated ingot"); helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void armorToolEffectsAndStarsteelRegenerationAreServerAuthoritative(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); equip(player, "adamantine"); player.tickCount = 20; BaseMetalsEvents events = new BaseMetalsEvents(); events.onPlayerTick(new TickEvent.PlayerTickEvent.Post(player)); - require(helper, player.getEffect(MobEffects.DAMAGE_RESISTANCE) != null - && player.getEffect(MobEffects.DAMAGE_RESISTANCE).getAmplifier() == 1, + require(helper, player.getEffect(MobEffects.RESISTANCE) != null + && player.getEffect(MobEffects.RESISTANCE).getAmplifier() == 1, "Four Adamantine pieces did not grant Resistance II"); - require(helper, player.getEffect(MobEffects.DAMAGE_RESISTANCE).getDuration() == 45, + require(helper, player.getEffect(MobEffects.RESISTANCE).getDuration() == 45, "Armor effects linger far beyond the legacy refresh window"); ItemStack starsteel = ModContent.item("starsteel_pickaxe").get().getDefaultInstance(); @@ -761,7 +796,7 @@ public static void armorToolEffectsAndStarsteelRegenerationAreServerAuthoritativ helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void remainingLegacyArmorEffectsUseTheCorrectPieceCounts(GameTestHelper helper) { BaseMetalsEvents events = new BaseMetalsEvents(); @@ -769,13 +804,13 @@ public static void remainingLegacyArmorEffectsUseTheCorrectPieceCounts(GameTestH equip(adamantine, "adamantine"); adamantine.setItemSlot(EquipmentSlot.FEET, ItemStack.EMPTY); tickEffects(events, adamantine); - require(helper, effectAmplifier(adamantine, MobEffects.DAMAGE_RESISTANCE) == 0, + require(helper, effectAmplifier(adamantine, MobEffects.RESISTANCE) == 0, "Three Adamantine pieces did not grant Resistance I"); ServerPlayer lead = survivalPlayer(helper); equip(lead, "lead"); tickEffects(events, lead); - require(helper, effectAmplifier(lead, MobEffects.MOVEMENT_SLOWDOWN) == 1, + require(helper, effectAmplifier(lead, MobEffects.SLOWNESS) == 1, "Four Lead pieces did not grant Slowness II"); ServerPlayer coldiron = survivalPlayer(helper); @@ -794,14 +829,14 @@ public static void remainingLegacyArmorEffectsUseTheCorrectPieceCounts(GameTestH ServerPlayer starsteel = survivalPlayer(helper); equip(starsteel, "starsteel"); tickEffects(events, starsteel); - require(helper, effectAmplifier(starsteel, MobEffects.JUMP) == 3, + require(helper, effectAmplifier(starsteel, MobEffects.JUMP_BOOST) == 3, "Four Starsteel pieces did not grant Jump Boost IV"); - require(helper, effectAmplifier(starsteel, MobEffects.MOVEMENT_SPEED) == 2, + require(helper, effectAmplifier(starsteel, MobEffects.SPEED) == 2, "Four Starsteel pieces did not grant Speed III"); helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void remainingLegacyMeleeEffectsUseTargetIdentity(GameTestHelper helper) { BaseMetalsEvents events = new BaseMetalsEvents(); ServerPlayer player = survivalPlayer(helper); @@ -837,12 +872,9 @@ public static void remainingLegacyMeleeEffectsUseTargetIdentity(GameTestHelper h helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void eventBackedAdvancementsAwardForActualLegacyActions(GameTestHelper helper) { - ServerPlayer player = new ServerPlayer(helper.getLevel().getServer(), helper.getLevel(), - new GameProfile(UUID.randomUUID(), "basemetals-advancement-test"), - net.minecraft.server.level.ClientInformation.createDefault()); - player.setGameMode(GameType.SURVIVAL); + ServerPlayer player = survivalPlayer(helper); BaseMetalsEvents events = new BaseMetalsEvents(); events.onItemCrafted(new PlayerEvent.ItemCraftedEvent(player, ModContent.item("iron_crackhammer").get().getDefaultInstance(), new SimpleContainer(0))); @@ -852,8 +884,8 @@ public static void eventBackedAdvancementsAwardForActualLegacyActions(GameTestHe ModContent.item("bronze_ingot").get().getDefaultInstance())); for (String advancement : new String[] {"geologist", "metallurgy", "this_is_new", "bronze_maker"}) { - var definition = player.getServer().getAdvancements().get( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, advancement)); + var definition = player.level().getServer().getAdvancements().get( + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, advancement)); require(helper, definition != null && player.getAdvancements().getOrStartProgress(definition).isDone(), "Legacy action did not award advancement " + advancement); @@ -863,14 +895,14 @@ public static void eventBackedAdvancementsAwardForActualLegacyActions(GameTestHe private static void assertCrushingRecipe(GameTestHelper helper, ItemStack input, String expectedItem, int expectedCount) { - var recipe = helper.getLevel().getRecipeManager().getRecipeFor( + var recipe = helper.getLevel().getServer().getRecipeManager().getRecipeFor( 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(":") - ? ResourceLocation.parse(expectedItem) - : ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, expectedItem); - require(helper, ForgeRegistries.ITEMS.getKey(recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getItem()).equals( + ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()); + Identifier expectedId = expectedItem.contains(":") + ? Identifier.parse(expectedItem) + : Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, expectedItem); + require(helper, ForgeRegistries.ITEMS.getKey(recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()).getItem()).equals( expectedId), input + " crushed to the wrong output"); require(helper, result.getCount() == expectedCount, input + " crushed to " + result.getCount() + " items instead of " + expectedCount); @@ -888,13 +920,13 @@ 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( + var recipe = helper.getLevel().getServer().getRecipeManager().getRecipeFor( 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); - ResourceLocation actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); - require(helper, actualItem.equals(ResourceLocation.parse(expectedItem)), + ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()); + Identifier actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); + require(helper, actualItem.equals(Identifier.parse(expectedItem)), input + " smelted to " + actualItem + " instead of " + expectedItem); require(helper, result.getCount() == expectedCount, input + " smelted to " + result.getCount() + " items instead of " + expectedCount); @@ -902,14 +934,14 @@ 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( + var recipe = helper.getLevel().getServer().getRecipeManager().getRecipeFor( 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); + ItemStack result = recipe.orElseThrow().value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(ItemStack.EMPTY), helper.getLevel().registryAccess()); TagKey tag = TagKey.create( - net.minecraft.core.registries.Registries.ITEM, ResourceLocation.parse(expectedTag)); - ResourceLocation actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); + net.minecraft.core.registries.Registries.ITEM, Identifier.parse(expectedTag)); + Identifier actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); require(helper, result.is(tag), input + " smelted to " + actualItem + ", which is outside #" + expectedTag); require(helper, result.getCount() == expectedCount, @@ -917,7 +949,7 @@ private static void assertSmeltingRecipeInTag(GameTestHelper helper, ItemStack i } private static void assertNoSmeltingRecipe(GameTestHelper helper, ItemStack input) { - var recipe = helper.getLevel().getRecipeManager().getRecipeFor( + var recipe = helper.getLevel().getServer().getRecipeManager().getRecipeFor( RecipeType.SMELTING, new net.minecraft.world.item.crafting.SingleRecipeInput(input), helper.getLevel()); require(helper, recipe.isEmpty(), input + " unexpectedly has a furnace recipe"); } @@ -925,7 +957,7 @@ private static void assertNoSmeltingRecipe(GameTestHelper helper, ItemStack inpu private static void assertItemStack(GameTestHelper helper, ItemStack stack, String expectedItem, int expectedCount, String description) { require(helper, ForgeRegistries.ITEMS.getKey(stack.getItem()).equals( - ResourceLocation.parse(expectedItem)), description + " used the wrong item"); + Identifier.parse(expectedItem)), description + " used the wrong item"); require(helper, stack.getCount() == expectedCount, description + " contained " + stack.getCount() + " items instead of " + expectedCount); } @@ -938,7 +970,7 @@ private static void requireSingleDrop(GameTestHelper helper, BlockPos position, if (drops.size() != 1) return; ItemStack output = drops.get(0).getItem(); require(helper, ForgeRegistries.ITEMS.getKey(output.getItem()).equals( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, expectedItem)), "Crushing produced the wrong item"); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, expectedItem)), "Crushing produced the wrong item"); require(helper, output.getCount() == expectedCount, "Crushing produced " + output.getCount() + " items instead of " + expectedCount); } @@ -955,7 +987,7 @@ private static ServerPlayer survivalPlayer(GameTestHelper helper) { return player; } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void projectilesRetainAmmunitionAcrossSaveAndSpawnData(GameTestHelper helper) { Player shooter = helper.makeMockPlayer(GameType.SURVIVAL); ItemStack ammunition = ModContent.item("starsteel_bolt").get().getDefaultInstance(); @@ -964,9 +996,9 @@ public static void projectilesRetainAmmunitionAcrossSaveAndSpawnData(GameTestHel "Projectile uses the vanilla packet, so Forge ammunition data cannot reach the client"); CompoundTag saved = new CompoundTag(); - original.addAdditionalSaveData(saved); + saved.merge(zone.moddev.mc.basemetals.content.RuntimeTestData.save(original)); MaterialProjectile loaded = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); - loaded.readAdditionalSaveData(saved); + zone.moddev.mc.basemetals.content.RuntimeTestData.load(loaded, saved); require(helper, ItemStack.isSameItemSameComponents(ammunition, loaded.getItem()), "Projectile ammunition was not retained through save/load"); @@ -994,7 +1026,7 @@ public boolean stillValid(Player player) { }, width, height); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void oreLootSupportsRawFortuneSilkTouchAndHammering(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack pickaxe = Items.NETHERITE_PICKAXE.getDefaultInstance(); @@ -1030,26 +1062,29 @@ public static void oreLootSupportsRawFortuneSilkTouchAndHammering(GameTestHelper helper.getLevel().setBlock(position, state, 3); player.setItemInHand(InteractionHand.MAIN_HAND, ModContent.item("adamantine_crackhammer").get().getDefaultInstance()); - var event = new net.minecraftforge.event.level.BlockEvent.BreakEvent(helper.getLevel(), position, state, player); + var event = new net.minecraftforge.event.level.BlockEvent.BreakEvent(helper.getLevel(), position, state, player, net.minecraftforge.common.util.Result.DEFAULT); new BaseMetalsEvents().onBreak(event); - require(helper, event.isCanceled() && helper.getLevel().getBlockState(position).isAir(), material + " hammer did not harvest the ore"); + require(helper, event.getResult().isDenied() && helper.getLevel().getBlockState(position).isAir(), material + " hammer did not harvest the ore"); requireSingleDrop(helper, position, null, material + "_powder", 2); helper.getLevel().getEntitiesOfClass(ItemEntity.class, new AABB(position).inflate(1.0D)).forEach(Entity::discard); } helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + @GameTest(structure = EMPTY) public static void fullyDrawnWeaponsApplyMaterialDamageBeforePower(GameTestHelper helper) { for (String material : List.of("gold", "steel", "adamantine")) { for (boolean crossbow : List.of(false, true)) { for (int power : List.of(0, 3)) { ServerPlayer player = survivalPlayer(helper); - player.moveTo(helper.absolutePos(new BlockPos(1, 2, 1)), 0.0F, 0.0F); + player.snapTo(helper.absolutePos(new BlockPos(1, 2, 1)), 0.0F, 0.0F); String launcher = material + (crossbow ? "_crossbow" : "_bow"); String ammo = material + (crossbow ? "_bolt" : "_arrow"); ItemStack weapon = ModContent.item(launcher).get().getDefaultInstance(); - if (power > 0) weapon.enchant(enchantment(helper, Enchantments.POWER), power); + if (power > 0) { + weapon.enchant(enchantment(helper, Enchantments.POWER), power); + weapon.enchant(enchantment(helper, Enchantments.FLAME), 1); + } player.setItemInHand(InteractionHand.MAIN_HAND, weapon); player.getInventory().setItem(1, ModContent.item(ammo).get().getDefaultInstance()); player.startUsingItem(InteractionHand.MAIN_HAND); @@ -1059,11 +1094,13 @@ public static void fullyDrawnWeaponsApplyMaterialDamageBeforePower(GameTestHelpe if (entity instanceof MaterialProjectile arrow && arrow.getOwner() == player) projectiles.add(arrow); }); double baseDamage = ((MaterialBacked) weapon.getItem()).baseMetalsMaterial().baseAttackDamage() * 2.0D; - require(helper, projectiles.size() == 1 && close(projectiles.get(0).getBaseDamage(), baseDamage), + require(helper, projectiles.size() == 1 && close(zone.moddev.mc.basemetals.content.RuntimeTestData.damage(projectiles.get(0)), baseDamage), launcher + " did not keep the material base damage=" + baseDamage); MaterialProjectile projectile = projectiles.getFirst(); - var target = EntityType.ZOMBIE.create(helper.getLevel()); + require(helper, projectile.isOnFire() == (power > 0), + launcher + " did not apply Flame at launch"); + var target = EntityType.ZOMBIE.create(helper.getLevel(), net.minecraft.world.entity.EntitySpawnReason.COMMAND); 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) @@ -1098,7 +1135,8 @@ private static net.minecraft.core.Holder "copper_ingot_from_nuggets"; + case "copper_nugget" -> "copper_nuggets"; + case "copper_horse_armor" -> "copper_horsearmor"; + default -> path; + }; + var recipe = level.getServer().getRecipeManager().byKey(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.RECIPE, Identifier.fromNamespaceAndPath( + BaseMetals.MOD_ID, recipeId))).orElseThrow(); + require(helper, ((net.minecraft.world.item.crafting.CraftingRecipe) recipe.value()).assemble( + net.minecraft.world.item.crafting.CraftingInput.EMPTY, level.registryAccess()).is(vanilla), recipeId + " still crafts the old duplicate item"); } @@ -124,7 +130,7 @@ public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper h 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, + var plate = level.getServer().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"); @@ -133,7 +139,7 @@ public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper h 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, + ItemStack recycled = level.getServer().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"); @@ -142,7 +148,7 @@ public static void vanillaCopperKeepsExistingRecipeChainsUsable(GameTestHelper h helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + @GameTest(structure = "basemetals:empty") public static void nativeEnchantmentsStillSupportMaterialEquipment(GameTestHelper helper) { var enchantments = helper.getLevel().registryAccess().lookupOrThrow(Registries.ENCHANTMENT); int checked = 0; @@ -159,7 +165,8 @@ public static void nativeEnchantmentsStillSupportMaterialEquipment(GameTestHelpe require(helper, enchantments.getOrThrow(Enchantments.POWER) .value().canEnchant(stack), "Power no longer supports " + stack); } - if (item instanceof DiggerItem || item instanceof ShearsItem) { + if ((item.components().has(net.minecraft.core.component.DataComponents.TOOL) + && !(item instanceof MaterialItems.Sword)) || item instanceof ShearsItem) { require(helper, enchantments.getOrThrow(Enchantments.EFFICIENCY) .value().canEnchant(stack), "Efficiency no longer supports " + stack); } @@ -167,7 +174,7 @@ public static void nativeEnchantmentsStillSupportMaterialEquipment(GameTestHelpe require(helper, enchantments.getOrThrow(Enchantments.LURE) .value().canEnchant(stack), "Lure no longer supports " + stack); } - if (item instanceof ArmorItem) { + if (item instanceof Armor) { require(helper, enchantments.getOrThrow(Enchantments.PROTECTION) .value().canEnchant(stack), "Protection no longer supports " + stack); } 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 b80f41883..520d72eee 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java @@ -3,7 +3,7 @@ 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.minecraftforge.gametest.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -16,31 +16,142 @@ 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 net.minecraftforge.gametest.GameTestNamespace; import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.entity.MaterialProjectile; import zone.moddev.mc.basemetals.entity.ModEntities; -@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestNamespace(BaseMetals.MOD_ID) @GameTestDontPrefix public final class NativeComponentGameTests { + private static final net.minecraft.resources.Identifier CAPABILITY_ID = + net.minecraft.resources.Identifier.parse("basemetals_tests:world_data"); + private static final java.util.Map CAPABILITIES = + new java.util.WeakHashMap<>(); + private NativeComponentGameTests() {} - @GameTest(batch = BaseMetals.MOD_ID, template = "empty", timeoutTicks = 600) + public static void registerCapabilityProbe() { + net.minecraftforge.event.AttachCapabilitiesEvent.Levels.BUS.addListener(event -> { + var capability = new SavedCapability(); + CAPABILITIES.put(event.getObject(), capability); + event.addCapability(CAPABILITY_ID, capability); + }); + } + + @GameTest(structure = "basemetals:empty") + public static void savedWorldCapabilitiesKeepLegacyAndCurrentPayloads(GameTestHelper helper) { + var codec = net.minecraftforge.common.util.LevelCapabilityData.type(helper.getLevel()).codec(); + var payload = new CompoundTag(); + payload.putString("owner", "Existing world"); + payload.putInt("counter", 37); + payload.putLongArray("custom_array", new long[] {11, 22, 33}); + var legacy = new CompoundTag(); + legacy.put(CAPABILITY_ID.toString(), payload); + + var loaded = codec.parse(net.minecraft.nbt.NbtOps.INSTANCE, legacy); + helper.assertTrue(loaded.isSuccess(), "Forge rejected the old capability payload: " + loaded.error()); + var provider = CAPABILITIES.get(helper.getLevel()); + helper.assertTrue(provider != null && payload.equals(provider.received), + "The legacy capability data did not reach its owner"); + + var encoded = codec.encodeStart(net.minecraft.nbt.NbtOps.INSTANCE, loaded.getOrThrow()).getOrThrow(); + helper.assertTrue(encoded instanceof CompoundTag compound + && payload.equals(compound.getCompoundOrEmpty("data").get(CAPABILITY_ID.toString())), + "New saves did not use Forge's current capability format"); + provider.received = null; + helper.assertTrue(codec.parse(net.minecraft.nbt.NbtOps.INSTANCE, encoded).isSuccess() + && payload.equals(provider.received), "The current capability format did not reload"); + helper.assertTrue(codec.parse(net.minecraft.nbt.NbtOps.INSTANCE, new CompoundTag()).isSuccess(), + "Empty legacy capability data did not load"); + + var malformed = new CompoundTag(); + malformed.putInt("data", 12); + helper.assertTrue(codec.parse(net.minecraft.nbt.NbtOps.INSTANCE, malformed).isError(), + "Malformed current data must not be mistaken for a legacy capability"); + helper.succeed(); + } + + private static final class SavedCapability implements + net.minecraftforge.common.capabilities.ICapabilitySerializable { + private CompoundTag received; + + @Override + public net.minecraftforge.common.util.LazyOptional getCapability( + net.minecraftforge.common.capabilities.Capability capability, net.minecraft.core.Direction side) { + return net.minecraftforge.common.util.LazyOptional.empty(); + } + + @Override + public CompoundTag serializeNBT(net.minecraft.core.HolderLookup.Provider registries) { + return received == null ? new CompoundTag() : received.copy(); + } + + @Override + public void deserializeNBT(net.minecraft.core.HolderLookup.Provider registries, CompoundTag data) { + received = data.copy(); + } + } + + @GameTest(structure = "basemetals:empty") + public static void oreHostTagsResolveAfterWorldStartup(GameTestHelper helper) throws Exception { + helper.assertTrue(zone.moddev.mc.orespawn.api.OreSpawnApi.getProviderStatus(BaseMetals.MOD_ID) + == zone.moddev.mc.orespawn.api.ProviderStatus.ACTIVE, "The Base Metals provider is not active"); + + var resolver = Class.forName("zone.moddev.mc.orespawn.worldgen.OreSpawnOreGeneration") + .getDeclaredMethod("resolveTag", net.minecraft.tags.TagKey.class); + resolver.setAccessible(true); + + var expected = java.util.Map.of( + "minecraft:stone_ore_replaceables", net.minecraft.world.level.block.Blocks.STONE, + "minecraft:deepslate_ore_replaceables", net.minecraft.world.level.block.Blocks.DEEPSLATE, + "forge:netherrack", net.minecraft.world.level.block.Blocks.NETHERRACK, + "forge:end_stones", net.minecraft.world.level.block.Blocks.END_STONE); + + for (var entry : expected.entrySet()) { + var tag = net.minecraft.tags.TagKey.create(Registries.BLOCK, + net.minecraft.resources.Identifier.parse(entry.getKey())); + var hosts = (java.util.Set) resolver.invoke(null, tag); + + helper.assertTrue(hosts.contains(entry.getValue()), + "OreSpawn did not resolve the loaded host tag " + entry.getKey()); + } + + helper.succeed(); + } + + @GameTest(structure = "basemetals:empty", maxTicks = 600) public static void everyNativeRecipeSurvivesNetworkEncoding(GameTestHelper helper) { int checked = 0; - for (var holder : helper.getLevel().getRecipeManager().getRecipes()) { - if (!holder.id().getNamespace().equals(BaseMetals.MOD_ID)) continue; + for (var holder : helper.getLevel().getServer().getRecipeManager().getRecipes()) { + if (!holder.id().identifier().getNamespace().equals(BaseMetals.MOD_ID)) continue; RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), helper.getLevel().registryAccess()); try { Recipe.STREAM_CODEC.encode(buffer, holder.value()); + byte[] original = new byte[buffer.readableBytes()]; + buffer.getBytes(buffer.readerIndex(), original); Recipe decoded = Recipe.STREAM_CODEC.decode(buffer); helper.assertTrue(decoded.getSerializer() == holder.value().getSerializer(), "Recipe serializer changed: " + holder.id()); - helper.assertTrue(net.minecraft.world.item.ItemStack.matches( - holder.value().getResultItem(helper.getLevel().registryAccess()), - decoded.getResultItem(helper.getLevel().registryAccess())), "Recipe output changed: " + holder.id()); + + // Native shaped recipes discard their source pattern after network decoding. + buffer.clear(); + Recipe.STREAM_CODEC.encode(buffer, decoded); + byte[] encodedAgain = new byte[buffer.readableBytes()]; + buffer.getBytes(buffer.readerIndex(), encodedAgain); + helper.assertTrue(java.util.Arrays.equals(original, encodedAgain), + "Recipe fields changed during network encoding: " + holder.id()); + + var ops = helper.getLevel().registryAccess().createSerializationContext( + com.mojang.serialization.JsonOps.INSTANCE); + var json = Recipe.CODEC.encodeStart(ops, holder.value()).getOrThrow(); + var parsed = Recipe.CODEC.parse(ops, json).getOrThrow(); + helper.assertTrue(json.equals(Recipe.CODEC.encodeStart(ops, parsed).getOrThrow()), + "Recipe fields changed during JSON encoding: " + holder.id()); helper.assertTrue(decoded.isSpecial() == holder.value().isSpecial(), "Recipe discovery changed: " + holder.id()); checked++; + } catch (RuntimeException failure) { + throw new IllegalStateException("Recipe " + holder.id().identifier() + ": " + + failure.getMessage(), failure); } finally { buffer.release(); } @@ -49,7 +160,7 @@ public static void everyNativeRecipeSurvivesNetworkEncoding(GameTestHelper helpe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + @GameTest(structure = "basemetals:empty") public static void oldEmbeddedBoltsKeepTheirCustomItemData(GameTestHelper helper) { CompoundTag ammunition = new CompoundTag(); ammunition.putString("id", "basemetals:adamantine_bolt"); @@ -67,27 +178,27 @@ public static void oldEmbeddedBoltsKeepTheirCustomItemData(GameTestHelper helper entity.put("Ammunition", ammunition); MaterialProjectile projectile = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); - projectile.readAdditionalSaveData(entity); + zone.moddev.mc.basemetals.content.RuntimeTestData.load(projectile, entity); var item = projectile.getItem(); helper.assertTrue(item.is(ModContent.item("adamantine_bolt").get()), "An old bolt changed its material"); helper.assertTrue(item.getHoverName().getString().equals("An old bolt"), "An old bolt lost its name"); helper.assertTrue(item.get(DataComponents.LORE).lines().getFirst().getString().equals("Saved before components"), "An old bolt lost its lore"); - helper.assertTrue(item.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getInt("Proof") == 147, + helper.assertTrue(item.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getIntOr("Proof", 0) == 147, "An old bolt lost custom data"); CompoundTag saved = new CompoundTag(); - projectile.addAdditionalSaveData(saved); + saved.merge(zone.moddev.mc.basemetals.content.RuntimeTestData.save(projectile)); MaterialProjectile reloaded = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); - reloaded.readAdditionalSaveData(saved); + zone.moddev.mc.basemetals.content.RuntimeTestData.load(reloaded, saved); 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") + @GameTest(structure = "basemetals: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); + var shooter = EntityType.ZOMBIE.create(level, net.minecraft.world.entity.EntitySpawnReason.COMMAND); + var target = EntityType.ZOMBIE.create(level, net.minecraft.world.entity.EntitySpawnReason.COMMAND); for (boolean bolt : new boolean[] {false, true}) { ItemStack weapon = ModContent.item("steel_" + (bolt ? "crossbow" : "bow")).get().getDefaultInstance(); @@ -98,12 +209,13 @@ public static void projectilesKeepWeaponEnchantmentsAfterReload(GameTestHelper h 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); + net.minecraft.world.entity.projectile.Projectile.spawnProjectile(projectile, level, ammunition); helper.assertTrue(projectile.isOnFire(), "Flame did not ignite the material projectile"); - CompoundTag saved = projectile.saveWithoutId(new CompoundTag()); + CompoundTag saved = zone.moddev.mc.basemetals.content.RuntimeTestData.save(projectile); MaterialProjectile reloaded = new MaterialProjectile(type, level); - reloaded.load(saved); + zone.moddev.mc.basemetals.content.RuntimeTestData.load(reloaded, saved); helper.assertTrue(ItemStack.matches(weapon, reloaded.getWeaponItem()), "The saved projectile lost its firing weapon or enchantments"); diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/RuntimeTestData.java b/src/gametest/java/zone/moddev/mc/basemetals/content/RuntimeTestData.java new file mode 100644 index 000000000..af7dbe508 --- /dev/null +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/RuntimeTestData.java @@ -0,0 +1,27 @@ +package zone.moddev.mc.basemetals.content; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.ProblemReporter; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.projectile.arrow.AbstractArrow; +import net.minecraft.world.level.storage.TagValueInput; +import net.minecraft.world.level.storage.TagValueOutput; + +/** Reads the same saved fields that the game uses, rather than private entity fields. */ +public final class RuntimeTestData { + private RuntimeTestData() {} + + public static CompoundTag save(Entity entity) { + TagValueOutput output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, entity.registryAccess()); + entity.saveWithoutId(output); + return output.buildResult(); + } + + public static void load(Entity entity, CompoundTag saved) { + entity.load(TagValueInput.create(ProblemReporter.DISCARDING, entity.registryAccess(), saved)); + } + + public static double damage(AbstractArrow arrow) { + return save(arrow).getDoubleOr("damage", 2.0D); + } +} diff --git a/src/gametest/java/zone/moddev/mc/basemetals/migration/MigrationGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/migration/MigrationGameTests.java index 2298c7ec8..ea924fa0a 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/migration/MigrationGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/migration/MigrationGameTests.java @@ -6,23 +6,23 @@ import zone.moddev.mc.basemetals.BaseMetals; -import net.minecraft.gametest.framework.GameTest; +import net.minecraftforge.gametest.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.nbt.ByteArrayTag; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.IntArrayTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; -import net.minecraftforge.gametest.GameTestHolder; +import net.minecraftforge.gametest.GameTestNamespace; import net.minecraftforge.gametest.GameTestDontPrefix; /** Direct coverage of the pre-flattening overlay around Mojang's data fixer. */ -@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestNamespace(BaseMetals.MOD_ID) @GameTestDontPrefix public final class MigrationGameTests { private MigrationGameTests() {} - @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + @GameTest(structure = "basemetals:empty") public static void floorAndCeilingLeversKeepTheirLegacyOrientation(GameTestHelper helper) { var lever = net.minecraft.world.level.block.Blocks.LEVER; for (int metadata : new int[] {0, 5, 6, 7, 8, 13, 14, 15}) { @@ -37,66 +37,66 @@ public static void floorAndCeilingLeversKeepTheirLegacyOrientation(GameTestHelpe helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + @GameTest(structure = "basemetals:empty") public static void vanillaFixesAndMmdlibStatesSurviveTheSameChunkConversion(GameTestHelper helper) { try { CompoundTag converted = Legacy112WorldMigrator.convertChunkForTest(legacyChunk(1_343), legacyIds()); - require(helper, converted.getInt("DataVersion") == 1_456, + require(helper, converted.getIntOr("DataVersion", 0) == 1_456, "Migration did not stop at the safe post-flattening data version"); CompoundTag vanillaLower = Legacy112WorldMigrator.stateAtForTest(converted, 5, index(0, 1, 0)); CompoundTag vanillaUpper = Legacy112WorldMigrator.stateAtForTest(converted, 5, index(0, 2, 0)); - require(helper, vanillaLower.getString("Name").equals("minecraft:oak_door"), + require(helper, vanillaLower.getStringOr("Name", "").equals("minecraft:oak_door"), "Mojang's vanilla wooden-door flattening did not run"); require(helper, hasDoorProperties(vanillaLower) && hasDoorProperties(vanillaUpper), "Mojang's context-sensitive vanilla door fix did not merge both halves"); CompoundTag aliasLower = Legacy112WorldMigrator.stateAtForTest(converted, 5, index(2, 1, 0)); CompoundTag aliasUpper = Legacy112WorldMigrator.stateAtForTest(converted, 5, index(2, 2, 0)); - require(helper, aliasLower.getString("Name").equals("basemetals:quartz_door") - && aliasUpper.getString("Name").equals("basemetals:quartz_door"), + require(helper, aliasLower.getStringOr("Name", "").equals("basemetals:quartz_door") + && aliasUpper.getStringOr("Name", "").equals("basemetals:quartz_door"), "mmdlib block aliases were not restored under Base Metals"); require(helper, hasDoorProperties(aliasLower) && hasDoorProperties(aliasUpper), "Base Metals door halves did not receive a complete modern state"); - require(helper, aliasLower.getCompound("Properties").getString("open").equals("true") - && aliasUpper.getCompound("Properties").getString("hinge").equals("right") - && aliasUpper.getCompound("Properties").getString("powered").equals("true"), + require(helper, aliasLower.getCompoundOrEmpty("Properties").getStringOr("open", "").equals("true") + && aliasUpper.getCompoundOrEmpty("Properties").getStringOr("hinge", "").equals("right") + && aliasUpper.getCompoundOrEmpty("Properties").getStringOr("powered", "").equals("true"), "Base Metals door metadata was not merged across its two halves"); CompoundTag plate = Legacy112WorldMigrator.stateAtForTest(converted, 5, index(4, 1, 0)); - require(helper, plate.getString("Name").equals("basemetals:copper_plate") - && plate.getCompound("Properties").getString("facing").equals("east"), + require(helper, plate.getStringOr("Name", "").equals("basemetals:copper_plate") + && plate.getCompoundOrEmpty("Properties").getStringOr("facing", "").equals("east"), "mmdlib metadata was lost while forwarding a stateful block"); CompoundTag cyanoExternal = Legacy112WorldMigrator.stateAtForTest(converted, 5, index(6, 1, 0)); - require(helper, cyanoExternal.getString("Name").equals("mca:rosegoldore"), + require(helper, cyanoExternal.getStringOr("Name", "").equals("mca:rosegoldore"), "Minecraft 1.10 mixed-case registry paths were not normalized"); - CompoundTag chest = converted.getCompound("Level").getList("TileEntities", Tag.TAG_COMPOUND) - .getCompound(0); - CompoundTag bucket = chest.getList("Items", Tag.TAG_COMPOUND).getCompound(0); - require(helper, bucket.getString("id").equals("basemetals:mercury_bucket"), + CompoundTag chest = converted.getCompoundOrEmpty("Level").getListOrEmpty("TileEntities") + .getCompoundOrEmpty(0); + CompoundTag bucket = chest.getListOrEmpty("Items").getCompoundOrEmpty(0); + require(helper, bucket.getStringOr("id", "").equals("basemetals:mercury_bucket"), "Legacy Forge universal bucket did not become its dedicated Base Metals bucket"); - require(helper, !bucket.contains("tag", Tag.TAG_COMPOUND) - || !bucket.getCompound("tag").contains("FluidName", Tag.TAG_STRING), + require(helper, !zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(bucket, "tag", Tag.TAG_COMPOUND) + || !bucket.getCompoundOrEmpty("tag").getString("FluidName").isPresent(), "Obsolete universal-bucket fluid metadata survived conversion"); - CompoundTag damagedTool = chest.getList("Items", Tag.TAG_COMPOUND).getCompound(1); - require(helper, damagedTool.getCompound("tag").getInt("Damage") == 12, + CompoundTag damagedTool = chest.getListOrEmpty("Items").getCompoundOrEmpty(1); + require(helper, damagedTool.getCompoundOrEmpty("tag").getIntOr("Damage", 0) == 12, "Legacy mod-item damage was consumed as flattening metadata"); - require(helper, chest.getList("Items", Tag.TAG_COMPOUND).getCompound(2) - .getString("id").equals("basemetals:coal_powder"), + require(helper, chest.getListOrEmpty("Items").getCompoundOrEmpty(2) + .getStringOr("id", "").equals("basemetals:coal_powder"), "Cyano carbon-powder item alias was not forwarded"); - require(helper, chest.getList("Items", Tag.TAG_COMPOUND).getCompound(3) - .getString("id").equals("minecraft:iron_nugget"), + require(helper, chest.getListOrEmpty("Items").getCompoundOrEmpty(3) + .getStringOr("id", "").equals("minecraft:iron_nugget"), "Legacy MMDLib iron nugget was not forwarded to vanilla"); - require(helper, chest.getList("Items", Tag.TAG_COMPOUND).getCompound(4) - .getString("id").equals("basemetals:quartz_door"), + require(helper, chest.getListOrEmpty("Items").getCompoundOrEmpty(4) + .getStringOr("id", "").equals("basemetals:quartz_door"), "Legacy MMDLib door-item alias was not forwarded"); CompoundTag cabinet = findBlockEntity(converted, "cfmCabinet"); require(helper, cabinet != null, "Third-party block entity at a restored mod block was discarded"); - require(helper, cabinet.getList("cabinetItems", Tag.TAG_COMPOUND).getCompound(0) - .getString("id").equals("basemetals:coal_powder"), + require(helper, cabinet.getListOrEmpty("cabinetItems").getCompoundOrEmpty(0) + .getStringOr("id", "").equals("basemetals:coal_powder"), "Items inside a restored third-party block entity were not migrated"); } catch (IOException | RuntimeException exception) { helper.fail("Legacy chunk conversion failed: " + exception); @@ -105,30 +105,30 @@ public static void vanillaFixesAndMmdlibStatesSurviveTheSameChunkConversion(Game helper.succeed(); } - @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + @GameTest(structure = "basemetals:empty") public static void mmdForge110ChunksUseTheCompleteFlatteningPath(GameTestHelper helper) { try { CompoundTag converted = Legacy112WorldMigrator.convertChunkForTest(legacyChunk(512), legacyIds()); - require(helper, converted.getInt("DataVersion") == 1_456, + require(helper, converted.getIntOr("DataVersion", 0) == 1_456, "Forge 1.10 chunk did not reach the safe post-flattening data version"); require(helper, Legacy112WorldMigrator.stateAtForTest(converted, 5, index(2, 1, 0)) - .getString("Name").equals("basemetals:quartz_door"), + .getStringOr("Name", "").equals("basemetals:quartz_door"), "Forge 1.10 mmdlib block alias was not restored under Base Metals"); require(helper, Legacy112WorldMigrator.stateAtForTest(converted, 5, index(4, 1, 0)) - .getString("Name").equals("basemetals:copper_plate"), + .getStringOr("Name", "").equals("basemetals:copper_plate"), "Forge 1.10 Base Metals stateful block was not restored"); - CompoundTag chest = converted.getCompound("Level").getList("TileEntities", Tag.TAG_COMPOUND) - .getCompound(0); - require(helper, chest.getList("Items", Tag.TAG_COMPOUND).getCompound(0) - .getString("id").equals("basemetals:mercury_bucket"), + CompoundTag chest = converted.getCompoundOrEmpty("Level").getListOrEmpty("TileEntities") + .getCompoundOrEmpty(0); + require(helper, chest.getListOrEmpty("Items").getCompoundOrEmpty(0) + .getStringOr("id", "").equals("basemetals:mercury_bucket"), "Forge 1.10 universal bucket did not become its dedicated Base Metals bucket"); - require(helper, chest.getList("Items", Tag.TAG_COMPOUND).getCompound(1) - .getCompound("tag").getInt("Damage") == 12, + require(helper, chest.getListOrEmpty("Items").getCompoundOrEmpty(1) + .getCompoundOrEmpty("tag").getIntOr("Damage", 0) == 12, "Forge 1.10 mod-item durability was consumed as flattening metadata"); - require(helper, chest.getList("Items", Tag.TAG_COMPOUND).getCompound(2) - .getString("id").equals("basemetals:coal_powder"), + require(helper, chest.getListOrEmpty("Items").getCompoundOrEmpty(2) + .getStringOr("id", "").equals("basemetals:coal_powder"), "Forge 1.10 Cyano item alias was not forwarded"); } catch (IOException | RuntimeException exception) { helper.fail("Forge 1.10 MMD chunk conversion failed: " + exception); @@ -237,9 +237,9 @@ private static Map legacyIds() { } private static CompoundTag findBlockEntity(CompoundTag chunk, String id) { - for (Tag value : chunk.getCompound("Level").getList("TileEntities", Tag.TAG_COMPOUND)) { + for (Tag value : chunk.getCompoundOrEmpty("Level").getListOrEmpty("TileEntities")) { CompoundTag blockEntity = (CompoundTag) value; - if (blockEntity.getString("id").equals(id)) return blockEntity; + if (blockEntity.getStringOr("id", "").equals(id)) return blockEntity; } return null; } @@ -261,13 +261,13 @@ private static void setNibble(byte[] values, int index, int value) { } private static boolean hasDoorProperties(CompoundTag state) { - if (!state.contains("Properties", Tag.TAG_COMPOUND)) return false; - CompoundTag properties = state.getCompound("Properties"); - return properties.contains("half", Tag.TAG_STRING) - && properties.contains("facing", Tag.TAG_STRING) - && properties.contains("open", Tag.TAG_STRING) - && properties.contains("hinge", Tag.TAG_STRING) - && properties.contains("powered", Tag.TAG_STRING); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(state, "Properties", Tag.TAG_COMPOUND)) return false; + CompoundTag properties = state.getCompoundOrEmpty("Properties"); + return zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(properties, "half", Tag.TAG_STRING) + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(properties, "facing", Tag.TAG_STRING) + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(properties, "open", Tag.TAG_STRING) + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(properties, "hinge", Tag.TAG_STRING) + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(properties, "powered", Tag.TAG_STRING); } private static void require(GameTestHelper helper, boolean condition, String message) { diff --git a/src/generated/resources/assets/basemetals/equipment/adamantine.json b/src/generated/resources/assets/basemetals/equipment/adamantine.json new file mode 100644 index 000000000..d3378730c --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/adamantine.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:adamantine" + } + ], + "humanoid": [ + { + "texture": "basemetals:adamantine" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:adamantine" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/antimony.json b/src/generated/resources/assets/basemetals/equipment/antimony.json new file mode 100644 index 000000000..cb8b83459 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/antimony.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:antimony" + } + ], + "humanoid": [ + { + "texture": "basemetals:antimony" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:antimony" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/aquarium.json b/src/generated/resources/assets/basemetals/equipment/aquarium.json new file mode 100644 index 000000000..925154290 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/aquarium.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:aquarium" + } + ], + "humanoid": [ + { + "texture": "basemetals:aquarium" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:aquarium" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/bismuth.json b/src/generated/resources/assets/basemetals/equipment/bismuth.json new file mode 100644 index 000000000..25cfec98a --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/bismuth.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:bismuth" + } + ], + "humanoid": [ + { + "texture": "basemetals:bismuth" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:bismuth" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/brass.json b/src/generated/resources/assets/basemetals/equipment/brass.json new file mode 100644 index 000000000..edb7648d0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/brass.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:brass" + } + ], + "humanoid": [ + { + "texture": "basemetals:brass" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:brass" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/bronze.json b/src/generated/resources/assets/basemetals/equipment/bronze.json new file mode 100644 index 000000000..9cc399613 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/bronze.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:bronze" + } + ], + "humanoid": [ + { + "texture": "basemetals:bronze" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:bronze" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/coldiron.json b/src/generated/resources/assets/basemetals/equipment/coldiron.json new file mode 100644 index 000000000..0c1a7a028 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/coldiron.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:coldiron" + } + ], + "humanoid": [ + { + "texture": "basemetals:coldiron" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:coldiron" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/copper.json b/src/generated/resources/assets/basemetals/equipment/copper.json new file mode 100644 index 000000000..0689c02fe --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/copper.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:copper" + } + ], + "humanoid": [ + { + "texture": "basemetals:copper" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:copper" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/cupronickel.json b/src/generated/resources/assets/basemetals/equipment/cupronickel.json new file mode 100644 index 000000000..cc81648c4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/cupronickel.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:cupronickel" + } + ], + "humanoid": [ + { + "texture": "basemetals:cupronickel" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:cupronickel" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/electrum.json b/src/generated/resources/assets/basemetals/equipment/electrum.json new file mode 100644 index 000000000..5d321bf6f --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/electrum.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:electrum" + } + ], + "humanoid": [ + { + "texture": "basemetals:electrum" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:electrum" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/emerald.json b/src/generated/resources/assets/basemetals/equipment/emerald.json new file mode 100644 index 000000000..745e0d6d8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/emerald.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:emerald" + } + ], + "humanoid": [ + { + "texture": "basemetals:emerald" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:emerald" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/invar.json b/src/generated/resources/assets/basemetals/equipment/invar.json new file mode 100644 index 000000000..5ea44998a --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/invar.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:invar" + } + ], + "humanoid": [ + { + "texture": "basemetals:invar" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:invar" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/lead.json b/src/generated/resources/assets/basemetals/equipment/lead.json new file mode 100644 index 000000000..8f2cc4eeb --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/lead.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:lead" + } + ], + "humanoid": [ + { + "texture": "basemetals:lead" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:lead" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/mithril.json b/src/generated/resources/assets/basemetals/equipment/mithril.json new file mode 100644 index 000000000..ec38ce224 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/mithril.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:mithril" + } + ], + "humanoid": [ + { + "texture": "basemetals:mithril" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:mithril" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/nickel.json b/src/generated/resources/assets/basemetals/equipment/nickel.json new file mode 100644 index 000000000..d450121fa --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/nickel.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:nickel" + } + ], + "humanoid": [ + { + "texture": "basemetals:nickel" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:nickel" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/obsidian.json b/src/generated/resources/assets/basemetals/equipment/obsidian.json new file mode 100644 index 000000000..1cac327c3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/obsidian.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:obsidian" + } + ], + "humanoid": [ + { + "texture": "basemetals:obsidian" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:obsidian" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/pewter.json b/src/generated/resources/assets/basemetals/equipment/pewter.json new file mode 100644 index 000000000..b70f0a304 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/pewter.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:pewter" + } + ], + "humanoid": [ + { + "texture": "basemetals:pewter" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:pewter" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/platinum.json b/src/generated/resources/assets/basemetals/equipment/platinum.json new file mode 100644 index 000000000..ef3f9caaf --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/platinum.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:platinum" + } + ], + "humanoid": [ + { + "texture": "basemetals:platinum" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:platinum" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/quartz.json b/src/generated/resources/assets/basemetals/equipment/quartz.json new file mode 100644 index 000000000..35b14b5d2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/quartz.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:quartz" + } + ], + "humanoid": [ + { + "texture": "basemetals:quartz" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:quartz" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/silver.json b/src/generated/resources/assets/basemetals/equipment/silver.json new file mode 100644 index 000000000..daa17dca5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/silver.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:silver" + } + ], + "humanoid": [ + { + "texture": "basemetals:silver" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:silver" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/starsteel.json b/src/generated/resources/assets/basemetals/equipment/starsteel.json new file mode 100644 index 000000000..c7a7d2cbc --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/starsteel.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:starsteel" + } + ], + "humanoid": [ + { + "texture": "basemetals:starsteel" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:starsteel" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/steel.json b/src/generated/resources/assets/basemetals/equipment/steel.json new file mode 100644 index 000000000..6b2473955 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/steel.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:steel" + } + ], + "humanoid": [ + { + "texture": "basemetals:steel" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:steel" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/tin.json b/src/generated/resources/assets/basemetals/equipment/tin.json new file mode 100644 index 000000000..97d02216f --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/tin.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:tin" + } + ], + "humanoid": [ + { + "texture": "basemetals:tin" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:tin" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/equipment/zinc.json b/src/generated/resources/assets/basemetals/equipment/zinc.json new file mode 100644 index 000000000..00737f4e5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/equipment/zinc.json @@ -0,0 +1,19 @@ +{ + "layers": { + "horse_body": [ + { + "texture": "basemetals:zinc" + } + ], + "humanoid": [ + { + "texture": "basemetals:zinc" + } + ], + "humanoid_leggings": [ + { + "texture": "basemetals:zinc" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine.json b/src/generated/resources/assets/basemetals/items/adamantine.json new file mode 100644 index 000000000..d8e977f0e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_anvil.json b/src/generated/resources/assets/basemetals/items/adamantine_anvil.json new file mode 100644 index 000000000..6445dce67 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_anvil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_anvil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_arrow.json b/src/generated/resources/assets/basemetals/items/adamantine_arrow.json new file mode 100644 index 000000000..b8b22f8ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_axe.json b/src/generated/resources/assets/basemetals/items/adamantine_axe.json new file mode 100644 index 000000000..7beaa256a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_bars.json b/src/generated/resources/assets/basemetals/items/adamantine_bars.json new file mode 100644 index 000000000..1adb750eb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_block.json b/src/generated/resources/assets/basemetals/items/adamantine_block.json new file mode 100644 index 000000000..d308f32f2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_bolt.json b/src/generated/resources/assets/basemetals/items/adamantine_bolt.json new file mode 100644 index 000000000..5f5fefa4e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_boots.json b/src/generated/resources/assets/basemetals/items/adamantine_boots.json new file mode 100644 index 000000000..ce9100369 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_bow.json b/src/generated/resources/assets/basemetals/items/adamantine_bow.json new file mode 100644 index 000000000..f379861b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_bucket.json b/src/generated/resources/assets/basemetals/items/adamantine_bucket.json new file mode 100644 index 000000000..8d9334925 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -11323073 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_button.json b/src/generated/resources/assets/basemetals/items/adamantine_button.json new file mode 100644 index 000000000..ccdc90dde --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_casing.json b/src/generated/resources/assets/basemetals/items/adamantine_casing.json new file mode 100644 index 000000000..952b1a207 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_chestplate.json b/src/generated/resources/assets/basemetals/items/adamantine_chestplate.json new file mode 100644 index 000000000..d64f4df19 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_clump.json b/src/generated/resources/assets/basemetals/items/adamantine_clump.json new file mode 100644 index 000000000..ca77ae815 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_crackhammer.json b/src/generated/resources/assets/basemetals/items/adamantine_crackhammer.json new file mode 100644 index 000000000..2de0ce295 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_crossbow.json b/src/generated/resources/assets/basemetals/items/adamantine_crossbow.json new file mode 100644 index 000000000..5a33ea315 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_crushed.json b/src/generated/resources/assets/basemetals/items/adamantine_crushed.json new file mode 100644 index 000000000..28b465c8e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_crushed_purified.json b/src/generated/resources/assets/basemetals/items/adamantine_crushed_purified.json new file mode 100644 index 000000000..e45f7452e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_crystal.json b/src/generated/resources/assets/basemetals/items/adamantine_crystal.json new file mode 100644 index 000000000..686701d96 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_dense_plate.json b/src/generated/resources/assets/basemetals/items/adamantine_dense_plate.json new file mode 100644 index 000000000..80e0a4c4f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_door.json b/src/generated/resources/assets/basemetals/items/adamantine_door.json new file mode 100644 index 000000000..b5f5389ff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_fishing_rod.json b/src/generated/resources/assets/basemetals/items/adamantine_fishing_rod.json new file mode 100644 index 000000000..8e02b070e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_gear.json b/src/generated/resources/assets/basemetals/items/adamantine_gear.json new file mode 100644 index 000000000..52e4995d0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_helmet.json b/src/generated/resources/assets/basemetals/items/adamantine_helmet.json new file mode 100644 index 000000000..e59edd888 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_hoe.json b/src/generated/resources/assets/basemetals/items/adamantine_hoe.json new file mode 100644 index 000000000..4c2a727ce --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_horse_armor.json b/src/generated/resources/assets/basemetals/items/adamantine_horse_armor.json new file mode 100644 index 000000000..765635652 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_ingot.json b/src/generated/resources/assets/basemetals/items/adamantine_ingot.json new file mode 100644 index 000000000..c0f8906bb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_leggings.json b/src/generated/resources/assets/basemetals/items/adamantine_leggings.json new file mode 100644 index 000000000..9b051ae05 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_lever.json b/src/generated/resources/assets/basemetals/items/adamantine_lever.json new file mode 100644 index 000000000..43917b7bc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_nugget.json b/src/generated/resources/assets/basemetals/items/adamantine_nugget.json new file mode 100644 index 000000000..0754cb150 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_ore.json b/src/generated/resources/assets/basemetals/items/adamantine_ore.json new file mode 100644 index 000000000..1f8a4449f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_pickaxe.json b/src/generated/resources/assets/basemetals/items/adamantine_pickaxe.json new file mode 100644 index 000000000..b8aa2d6f9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_plate.json b/src/generated/resources/assets/basemetals/items/adamantine_plate.json new file mode 100644 index 000000000..e0bd02763 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_powder.json b/src/generated/resources/assets/basemetals/items/adamantine_powder.json new file mode 100644 index 000000000..2b724723e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_powder_dirty.json b/src/generated/resources/assets/basemetals/items/adamantine_powder_dirty.json new file mode 100644 index 000000000..0c054c6de --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_pressure_plate.json b/src/generated/resources/assets/basemetals/items/adamantine_pressure_plate.json new file mode 100644 index 000000000..02fd60f50 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_raw.json b/src/generated/resources/assets/basemetals/items/adamantine_raw.json new file mode 100644 index 000000000..e64ac86d6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_rod.json b/src/generated/resources/assets/basemetals/items/adamantine_rod.json new file mode 100644 index 000000000..4b5e729f0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_scythe.json b/src/generated/resources/assets/basemetals/items/adamantine_scythe.json new file mode 100644 index 000000000..3a8f3fb6c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_shard.json b/src/generated/resources/assets/basemetals/items/adamantine_shard.json new file mode 100644 index 000000000..8e16b7d44 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_shears.json b/src/generated/resources/assets/basemetals/items/adamantine_shears.json new file mode 100644 index 000000000..4f65eddab --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_shield.json b/src/generated/resources/assets/basemetals/items/adamantine_shield.json new file mode 100644 index 000000000..c96e1e398 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_shovel.json b/src/generated/resources/assets/basemetals/items/adamantine_shovel.json new file mode 100644 index 000000000..b8ac61ee7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_slab.json b/src/generated/resources/assets/basemetals/items/adamantine_slab.json new file mode 100644 index 000000000..4fbbd6be1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_smallpowder.json b/src/generated/resources/assets/basemetals/items/adamantine_smallpowder.json new file mode 100644 index 000000000..ca122e93b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_stairs.json b/src/generated/resources/assets/basemetals/items/adamantine_stairs.json new file mode 100644 index 000000000..24647f268 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_sword.json b/src/generated/resources/assets/basemetals/items/adamantine_sword.json new file mode 100644 index 000000000..3c147fc96 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_trapdoor.json b/src/generated/resources/assets/basemetals/items/adamantine_trapdoor.json new file mode 100644 index 000000000..f6fd5d8ff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/adamantine_wall.json b/src/generated/resources/assets/basemetals/items/adamantine_wall.json new file mode 100644 index 000000000..2ec55a008 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/adamantine_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/adamantine_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony.json b/src/generated/resources/assets/basemetals/items/antimony.json new file mode 100644 index 000000000..b239daf46 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_arrow.json b/src/generated/resources/assets/basemetals/items/antimony_arrow.json new file mode 100644 index 000000000..73725e486 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_axe.json b/src/generated/resources/assets/basemetals/items/antimony_axe.json new file mode 100644 index 000000000..9d36ed9fc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_bars.json b/src/generated/resources/assets/basemetals/items/antimony_bars.json new file mode 100644 index 000000000..d225bd2e0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_block.json b/src/generated/resources/assets/basemetals/items/antimony_block.json new file mode 100644 index 000000000..47aa2edcf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_bolt.json b/src/generated/resources/assets/basemetals/items/antimony_bolt.json new file mode 100644 index 000000000..8fa513620 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_boots.json b/src/generated/resources/assets/basemetals/items/antimony_boots.json new file mode 100644 index 000000000..b94df9c2f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_bow.json b/src/generated/resources/assets/basemetals/items/antimony_bow.json new file mode 100644 index 000000000..8d7659694 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_bucket.json b/src/generated/resources/assets/basemetals/items/antimony_bucket.json new file mode 100644 index 000000000..64b11169e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -2563106 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_button.json b/src/generated/resources/assets/basemetals/items/antimony_button.json new file mode 100644 index 000000000..fd2166858 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_casing.json b/src/generated/resources/assets/basemetals/items/antimony_casing.json new file mode 100644 index 000000000..520936841 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_chestplate.json b/src/generated/resources/assets/basemetals/items/antimony_chestplate.json new file mode 100644 index 000000000..af64f5638 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_clump.json b/src/generated/resources/assets/basemetals/items/antimony_clump.json new file mode 100644 index 000000000..1808ae9e8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_crackhammer.json b/src/generated/resources/assets/basemetals/items/antimony_crackhammer.json new file mode 100644 index 000000000..be873c031 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_crossbow.json b/src/generated/resources/assets/basemetals/items/antimony_crossbow.json new file mode 100644 index 000000000..895b7b786 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_crushed.json b/src/generated/resources/assets/basemetals/items/antimony_crushed.json new file mode 100644 index 000000000..b79755a13 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_crushed_purified.json b/src/generated/resources/assets/basemetals/items/antimony_crushed_purified.json new file mode 100644 index 000000000..78c826043 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_crystal.json b/src/generated/resources/assets/basemetals/items/antimony_crystal.json new file mode 100644 index 000000000..2c9e4e774 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_dense_plate.json b/src/generated/resources/assets/basemetals/items/antimony_dense_plate.json new file mode 100644 index 000000000..62f411890 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_door.json b/src/generated/resources/assets/basemetals/items/antimony_door.json new file mode 100644 index 000000000..ea953564c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_fishing_rod.json b/src/generated/resources/assets/basemetals/items/antimony_fishing_rod.json new file mode 100644 index 000000000..801510456 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_gear.json b/src/generated/resources/assets/basemetals/items/antimony_gear.json new file mode 100644 index 000000000..7c412d634 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_helmet.json b/src/generated/resources/assets/basemetals/items/antimony_helmet.json new file mode 100644 index 000000000..26260a88e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_hoe.json b/src/generated/resources/assets/basemetals/items/antimony_hoe.json new file mode 100644 index 000000000..222472f26 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_horse_armor.json b/src/generated/resources/assets/basemetals/items/antimony_horse_armor.json new file mode 100644 index 000000000..268f7064c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_ingot.json b/src/generated/resources/assets/basemetals/items/antimony_ingot.json new file mode 100644 index 000000000..4d0dd6172 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_leggings.json b/src/generated/resources/assets/basemetals/items/antimony_leggings.json new file mode 100644 index 000000000..01bbaeb74 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_lever.json b/src/generated/resources/assets/basemetals/items/antimony_lever.json new file mode 100644 index 000000000..97833261f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_nugget.json b/src/generated/resources/assets/basemetals/items/antimony_nugget.json new file mode 100644 index 000000000..45df4c6a5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_ore.json b/src/generated/resources/assets/basemetals/items/antimony_ore.json new file mode 100644 index 000000000..fb0766edd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_pickaxe.json b/src/generated/resources/assets/basemetals/items/antimony_pickaxe.json new file mode 100644 index 000000000..822c8c551 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_plate.json b/src/generated/resources/assets/basemetals/items/antimony_plate.json new file mode 100644 index 000000000..f4dfcdff2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_powder.json b/src/generated/resources/assets/basemetals/items/antimony_powder.json new file mode 100644 index 000000000..3821cdc42 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_powder_dirty.json b/src/generated/resources/assets/basemetals/items/antimony_powder_dirty.json new file mode 100644 index 000000000..a6240bb01 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_pressure_plate.json b/src/generated/resources/assets/basemetals/items/antimony_pressure_plate.json new file mode 100644 index 000000000..4eb1be0d7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_raw.json b/src/generated/resources/assets/basemetals/items/antimony_raw.json new file mode 100644 index 000000000..df316114a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_rod.json b/src/generated/resources/assets/basemetals/items/antimony_rod.json new file mode 100644 index 000000000..24ccb6308 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_scythe.json b/src/generated/resources/assets/basemetals/items/antimony_scythe.json new file mode 100644 index 000000000..e5be37aff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_shard.json b/src/generated/resources/assets/basemetals/items/antimony_shard.json new file mode 100644 index 000000000..f482671a4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_shears.json b/src/generated/resources/assets/basemetals/items/antimony_shears.json new file mode 100644 index 000000000..9ed434095 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_shield.json b/src/generated/resources/assets/basemetals/items/antimony_shield.json new file mode 100644 index 000000000..4ed8ee2f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_shovel.json b/src/generated/resources/assets/basemetals/items/antimony_shovel.json new file mode 100644 index 000000000..3c25b045e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_slab.json b/src/generated/resources/assets/basemetals/items/antimony_slab.json new file mode 100644 index 000000000..f2b8dfef7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_smallpowder.json b/src/generated/resources/assets/basemetals/items/antimony_smallpowder.json new file mode 100644 index 000000000..48f558dda --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_stairs.json b/src/generated/resources/assets/basemetals/items/antimony_stairs.json new file mode 100644 index 000000000..7f5eeebcc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_sword.json b/src/generated/resources/assets/basemetals/items/antimony_sword.json new file mode 100644 index 000000000..f9139a9e8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_trapdoor.json b/src/generated/resources/assets/basemetals/items/antimony_trapdoor.json new file mode 100644 index 000000000..408956dfa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/antimony_wall.json b/src/generated/resources/assets/basemetals/items/antimony_wall.json new file mode 100644 index 000000000..49adf69ff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/antimony_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/antimony_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium.json b/src/generated/resources/assets/basemetals/items/aquarium.json new file mode 100644 index 000000000..0c76e723a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_arrow.json b/src/generated/resources/assets/basemetals/items/aquarium_arrow.json new file mode 100644 index 000000000..7b4889dd3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_axe.json b/src/generated/resources/assets/basemetals/items/aquarium_axe.json new file mode 100644 index 000000000..b738728b8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_bars.json b/src/generated/resources/assets/basemetals/items/aquarium_bars.json new file mode 100644 index 000000000..f30f101be --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_blend.json b/src/generated/resources/assets/basemetals/items/aquarium_blend.json new file mode 100644 index 000000000..cde3dd9a3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_block.json b/src/generated/resources/assets/basemetals/items/aquarium_block.json new file mode 100644 index 000000000..d52ebfa40 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_bolt.json b/src/generated/resources/assets/basemetals/items/aquarium_bolt.json new file mode 100644 index 000000000..5d4d6d702 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_boots.json b/src/generated/resources/assets/basemetals/items/aquarium_boots.json new file mode 100644 index 000000000..4a38019fc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_bow.json b/src/generated/resources/assets/basemetals/items/aquarium_bow.json new file mode 100644 index 000000000..73b8fd742 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_bucket.json b/src/generated/resources/assets/basemetals/items/aquarium_bucket.json new file mode 100644 index 000000000..57bcf3448 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -16776961 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_button.json b/src/generated/resources/assets/basemetals/items/aquarium_button.json new file mode 100644 index 000000000..2f9b6444a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_chestplate.json b/src/generated/resources/assets/basemetals/items/aquarium_chestplate.json new file mode 100644 index 000000000..62ce382c4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_crackhammer.json b/src/generated/resources/assets/basemetals/items/aquarium_crackhammer.json new file mode 100644 index 000000000..2bc219bcd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_crossbow.json b/src/generated/resources/assets/basemetals/items/aquarium_crossbow.json new file mode 100644 index 000000000..09fb166f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_door.json b/src/generated/resources/assets/basemetals/items/aquarium_door.json new file mode 100644 index 000000000..1f6910178 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_fishing_rod.json b/src/generated/resources/assets/basemetals/items/aquarium_fishing_rod.json new file mode 100644 index 000000000..2cfa24848 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_gear.json b/src/generated/resources/assets/basemetals/items/aquarium_gear.json new file mode 100644 index 000000000..0db42cf85 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_helmet.json b/src/generated/resources/assets/basemetals/items/aquarium_helmet.json new file mode 100644 index 000000000..f27250084 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_hoe.json b/src/generated/resources/assets/basemetals/items/aquarium_hoe.json new file mode 100644 index 000000000..f0d100f7d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_horse_armor.json b/src/generated/resources/assets/basemetals/items/aquarium_horse_armor.json new file mode 100644 index 000000000..7dc715ba0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_ingot.json b/src/generated/resources/assets/basemetals/items/aquarium_ingot.json new file mode 100644 index 000000000..290f81196 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_leggings.json b/src/generated/resources/assets/basemetals/items/aquarium_leggings.json new file mode 100644 index 000000000..afe78597d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_lever.json b/src/generated/resources/assets/basemetals/items/aquarium_lever.json new file mode 100644 index 000000000..0ac22d366 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_nugget.json b/src/generated/resources/assets/basemetals/items/aquarium_nugget.json new file mode 100644 index 000000000..bc832467d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_pickaxe.json b/src/generated/resources/assets/basemetals/items/aquarium_pickaxe.json new file mode 100644 index 000000000..48137f32a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_plate.json b/src/generated/resources/assets/basemetals/items/aquarium_plate.json new file mode 100644 index 000000000..53414cb70 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_powder.json b/src/generated/resources/assets/basemetals/items/aquarium_powder.json new file mode 100644 index 000000000..b4cc8618b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_pressure_plate.json b/src/generated/resources/assets/basemetals/items/aquarium_pressure_plate.json new file mode 100644 index 000000000..1d8b8e76c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_rod.json b/src/generated/resources/assets/basemetals/items/aquarium_rod.json new file mode 100644 index 000000000..08e35057a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_scythe.json b/src/generated/resources/assets/basemetals/items/aquarium_scythe.json new file mode 100644 index 000000000..dd95a42e2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_shears.json b/src/generated/resources/assets/basemetals/items/aquarium_shears.json new file mode 100644 index 000000000..89dab11de --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_shield.json b/src/generated/resources/assets/basemetals/items/aquarium_shield.json new file mode 100644 index 000000000..f7824c48c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_shovel.json b/src/generated/resources/assets/basemetals/items/aquarium_shovel.json new file mode 100644 index 000000000..419841d50 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_slab.json b/src/generated/resources/assets/basemetals/items/aquarium_slab.json new file mode 100644 index 000000000..4a6977452 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_smallblend.json b/src/generated/resources/assets/basemetals/items/aquarium_smallblend.json new file mode 100644 index 000000000..413492edf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_smallpowder.json b/src/generated/resources/assets/basemetals/items/aquarium_smallpowder.json new file mode 100644 index 000000000..77fb6a82e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_stairs.json b/src/generated/resources/assets/basemetals/items/aquarium_stairs.json new file mode 100644 index 000000000..ecebab46e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_sword.json b/src/generated/resources/assets/basemetals/items/aquarium_sword.json new file mode 100644 index 000000000..952f9600f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_trapdoor.json b/src/generated/resources/assets/basemetals/items/aquarium_trapdoor.json new file mode 100644 index 000000000..41ba2ea50 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/aquarium_wall.json b/src/generated/resources/assets/basemetals/items/aquarium_wall.json new file mode 100644 index 000000000..bbf374830 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/aquarium_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/aquarium_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth.json b/src/generated/resources/assets/basemetals/items/bismuth.json new file mode 100644 index 000000000..e11f1fcec --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_arrow.json b/src/generated/resources/assets/basemetals/items/bismuth_arrow.json new file mode 100644 index 000000000..2ace5412a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_axe.json b/src/generated/resources/assets/basemetals/items/bismuth_axe.json new file mode 100644 index 000000000..6e77d0321 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_bars.json b/src/generated/resources/assets/basemetals/items/bismuth_bars.json new file mode 100644 index 000000000..efccb66d2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_block.json b/src/generated/resources/assets/basemetals/items/bismuth_block.json new file mode 100644 index 000000000..16e196645 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_bolt.json b/src/generated/resources/assets/basemetals/items/bismuth_bolt.json new file mode 100644 index 000000000..3c2458d01 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_boots.json b/src/generated/resources/assets/basemetals/items/bismuth_boots.json new file mode 100644 index 000000000..720bdba4b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_bow.json b/src/generated/resources/assets/basemetals/items/bismuth_bow.json new file mode 100644 index 000000000..2eade5307 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_bucket.json b/src/generated/resources/assets/basemetals/items/bismuth_bucket.json new file mode 100644 index 000000000..b1c307921 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -2238517 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_button.json b/src/generated/resources/assets/basemetals/items/bismuth_button.json new file mode 100644 index 000000000..a944d5a7f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_casing.json b/src/generated/resources/assets/basemetals/items/bismuth_casing.json new file mode 100644 index 000000000..d34630e2f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_chestplate.json b/src/generated/resources/assets/basemetals/items/bismuth_chestplate.json new file mode 100644 index 000000000..2e4bbc4cf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_clump.json b/src/generated/resources/assets/basemetals/items/bismuth_clump.json new file mode 100644 index 000000000..7a98d5a76 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_crackhammer.json b/src/generated/resources/assets/basemetals/items/bismuth_crackhammer.json new file mode 100644 index 000000000..fd22fc86f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_crossbow.json b/src/generated/resources/assets/basemetals/items/bismuth_crossbow.json new file mode 100644 index 000000000..b9112116c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_crushed.json b/src/generated/resources/assets/basemetals/items/bismuth_crushed.json new file mode 100644 index 000000000..103d06797 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_crushed_purified.json b/src/generated/resources/assets/basemetals/items/bismuth_crushed_purified.json new file mode 100644 index 000000000..94107a6a7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_crystal.json b/src/generated/resources/assets/basemetals/items/bismuth_crystal.json new file mode 100644 index 000000000..0fa75b50f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_dense_plate.json b/src/generated/resources/assets/basemetals/items/bismuth_dense_plate.json new file mode 100644 index 000000000..e34c5898b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_door.json b/src/generated/resources/assets/basemetals/items/bismuth_door.json new file mode 100644 index 000000000..7935f90c1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_fishing_rod.json b/src/generated/resources/assets/basemetals/items/bismuth_fishing_rod.json new file mode 100644 index 000000000..60dbcdd79 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_gear.json b/src/generated/resources/assets/basemetals/items/bismuth_gear.json new file mode 100644 index 000000000..124dbd01c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_helmet.json b/src/generated/resources/assets/basemetals/items/bismuth_helmet.json new file mode 100644 index 000000000..4b9674e09 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_hoe.json b/src/generated/resources/assets/basemetals/items/bismuth_hoe.json new file mode 100644 index 000000000..5036aa5a8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_horse_armor.json b/src/generated/resources/assets/basemetals/items/bismuth_horse_armor.json new file mode 100644 index 000000000..07400d89d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_ingot.json b/src/generated/resources/assets/basemetals/items/bismuth_ingot.json new file mode 100644 index 000000000..9c12a8573 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_leggings.json b/src/generated/resources/assets/basemetals/items/bismuth_leggings.json new file mode 100644 index 000000000..7966859b8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_lever.json b/src/generated/resources/assets/basemetals/items/bismuth_lever.json new file mode 100644 index 000000000..50f3574bc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_nugget.json b/src/generated/resources/assets/basemetals/items/bismuth_nugget.json new file mode 100644 index 000000000..090d1ee8a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_ore.json b/src/generated/resources/assets/basemetals/items/bismuth_ore.json new file mode 100644 index 000000000..4e0f46f50 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_pickaxe.json b/src/generated/resources/assets/basemetals/items/bismuth_pickaxe.json new file mode 100644 index 000000000..3ce16cb44 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_plate.json b/src/generated/resources/assets/basemetals/items/bismuth_plate.json new file mode 100644 index 000000000..229b0ede5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_powder.json b/src/generated/resources/assets/basemetals/items/bismuth_powder.json new file mode 100644 index 000000000..6ce17e9d9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_powder_dirty.json b/src/generated/resources/assets/basemetals/items/bismuth_powder_dirty.json new file mode 100644 index 000000000..e391afa07 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_pressure_plate.json b/src/generated/resources/assets/basemetals/items/bismuth_pressure_plate.json new file mode 100644 index 000000000..a3f752da2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_raw.json b/src/generated/resources/assets/basemetals/items/bismuth_raw.json new file mode 100644 index 000000000..b58519ce2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_rod.json b/src/generated/resources/assets/basemetals/items/bismuth_rod.json new file mode 100644 index 000000000..6b6339e03 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_scythe.json b/src/generated/resources/assets/basemetals/items/bismuth_scythe.json new file mode 100644 index 000000000..23528afec --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_shard.json b/src/generated/resources/assets/basemetals/items/bismuth_shard.json new file mode 100644 index 000000000..bfefa1f33 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_shears.json b/src/generated/resources/assets/basemetals/items/bismuth_shears.json new file mode 100644 index 000000000..de17ff729 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_shield.json b/src/generated/resources/assets/basemetals/items/bismuth_shield.json new file mode 100644 index 000000000..2174efefa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_shovel.json b/src/generated/resources/assets/basemetals/items/bismuth_shovel.json new file mode 100644 index 000000000..cb489878d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_slab.json b/src/generated/resources/assets/basemetals/items/bismuth_slab.json new file mode 100644 index 000000000..94e3a93e1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_smallpowder.json b/src/generated/resources/assets/basemetals/items/bismuth_smallpowder.json new file mode 100644 index 000000000..a0130cc89 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_stairs.json b/src/generated/resources/assets/basemetals/items/bismuth_stairs.json new file mode 100644 index 000000000..e3480c224 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_sword.json b/src/generated/resources/assets/basemetals/items/bismuth_sword.json new file mode 100644 index 000000000..154381e61 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_trapdoor.json b/src/generated/resources/assets/basemetals/items/bismuth_trapdoor.json new file mode 100644 index 000000000..baf353776 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bismuth_wall.json b/src/generated/resources/assets/basemetals/items/bismuth_wall.json new file mode 100644 index 000000000..12ba692e6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bismuth_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bismuth_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass.json b/src/generated/resources/assets/basemetals/items/brass.json new file mode 100644 index 000000000..a36604ab4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_arrow.json b/src/generated/resources/assets/basemetals/items/brass_arrow.json new file mode 100644 index 000000000..12ca5e654 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_axe.json b/src/generated/resources/assets/basemetals/items/brass_axe.json new file mode 100644 index 000000000..5962f3a96 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_bars.json b/src/generated/resources/assets/basemetals/items/brass_bars.json new file mode 100644 index 000000000..c261f0ec8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_blend.json b/src/generated/resources/assets/basemetals/items/brass_blend.json new file mode 100644 index 000000000..1deee79fd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_block.json b/src/generated/resources/assets/basemetals/items/brass_block.json new file mode 100644 index 000000000..8ffd038ff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_bolt.json b/src/generated/resources/assets/basemetals/items/brass_bolt.json new file mode 100644 index 000000000..06746d1bc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_boots.json b/src/generated/resources/assets/basemetals/items/brass_boots.json new file mode 100644 index 000000000..6ce242b94 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_bow.json b/src/generated/resources/assets/basemetals/items/brass_bow.json new file mode 100644 index 000000000..47cee62f0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_bucket.json b/src/generated/resources/assets/basemetals/items/brass_bucket.json new file mode 100644 index 000000000..2f74b6d27 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -7308 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_button.json b/src/generated/resources/assets/basemetals/items/brass_button.json new file mode 100644 index 000000000..6cb71c561 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_chestplate.json b/src/generated/resources/assets/basemetals/items/brass_chestplate.json new file mode 100644 index 000000000..e1c93e784 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_crackhammer.json b/src/generated/resources/assets/basemetals/items/brass_crackhammer.json new file mode 100644 index 000000000..476de1625 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_crossbow.json b/src/generated/resources/assets/basemetals/items/brass_crossbow.json new file mode 100644 index 000000000..c5e35b751 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/brass_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/brass_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_door.json b/src/generated/resources/assets/basemetals/items/brass_door.json new file mode 100644 index 000000000..c85571be3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_fishing_rod.json b/src/generated/resources/assets/basemetals/items/brass_fishing_rod.json new file mode 100644 index 000000000..13745b3ce --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/brass_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/brass_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_gear.json b/src/generated/resources/assets/basemetals/items/brass_gear.json new file mode 100644 index 000000000..f803a318c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_helmet.json b/src/generated/resources/assets/basemetals/items/brass_helmet.json new file mode 100644 index 000000000..8df953b73 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_hoe.json b/src/generated/resources/assets/basemetals/items/brass_hoe.json new file mode 100644 index 000000000..92c0070af --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_horse_armor.json b/src/generated/resources/assets/basemetals/items/brass_horse_armor.json new file mode 100644 index 000000000..2202339fa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_ingot.json b/src/generated/resources/assets/basemetals/items/brass_ingot.json new file mode 100644 index 000000000..ba951cb3f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_leggings.json b/src/generated/resources/assets/basemetals/items/brass_leggings.json new file mode 100644 index 000000000..9806e2f61 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_lever.json b/src/generated/resources/assets/basemetals/items/brass_lever.json new file mode 100644 index 000000000..42b195c54 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_nugget.json b/src/generated/resources/assets/basemetals/items/brass_nugget.json new file mode 100644 index 000000000..b87f77707 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_pickaxe.json b/src/generated/resources/assets/basemetals/items/brass_pickaxe.json new file mode 100644 index 000000000..6f07dfe96 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_plate.json b/src/generated/resources/assets/basemetals/items/brass_plate.json new file mode 100644 index 000000000..e8f7fa9fe --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_powder.json b/src/generated/resources/assets/basemetals/items/brass_powder.json new file mode 100644 index 000000000..a42e7a7e7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_pressure_plate.json b/src/generated/resources/assets/basemetals/items/brass_pressure_plate.json new file mode 100644 index 000000000..077297968 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_rod.json b/src/generated/resources/assets/basemetals/items/brass_rod.json new file mode 100644 index 000000000..9fbacd758 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_scythe.json b/src/generated/resources/assets/basemetals/items/brass_scythe.json new file mode 100644 index 000000000..4baa6dd55 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_shears.json b/src/generated/resources/assets/basemetals/items/brass_shears.json new file mode 100644 index 000000000..0888e440b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_shield.json b/src/generated/resources/assets/basemetals/items/brass_shield.json new file mode 100644 index 000000000..ee5637ed0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/brass_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/brass_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_shovel.json b/src/generated/resources/assets/basemetals/items/brass_shovel.json new file mode 100644 index 000000000..4753c539b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_slab.json b/src/generated/resources/assets/basemetals/items/brass_slab.json new file mode 100644 index 000000000..a20e9f27b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_smallblend.json b/src/generated/resources/assets/basemetals/items/brass_smallblend.json new file mode 100644 index 000000000..fec55812a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_smallpowder.json b/src/generated/resources/assets/basemetals/items/brass_smallpowder.json new file mode 100644 index 000000000..3ccd88a15 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_stairs.json b/src/generated/resources/assets/basemetals/items/brass_stairs.json new file mode 100644 index 000000000..23e1c84f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_sword.json b/src/generated/resources/assets/basemetals/items/brass_sword.json new file mode 100644 index 000000000..d790c5948 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_trapdoor.json b/src/generated/resources/assets/basemetals/items/brass_trapdoor.json new file mode 100644 index 000000000..b1116181c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/brass_wall.json b/src/generated/resources/assets/basemetals/items/brass_wall.json new file mode 100644 index 000000000..f86280531 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/brass_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/brass_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze.json b/src/generated/resources/assets/basemetals/items/bronze.json new file mode 100644 index 000000000..2be37a989 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_arrow.json b/src/generated/resources/assets/basemetals/items/bronze_arrow.json new file mode 100644 index 000000000..d09f20bb9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_axe.json b/src/generated/resources/assets/basemetals/items/bronze_axe.json new file mode 100644 index 000000000..0d589233e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_bars.json b/src/generated/resources/assets/basemetals/items/bronze_bars.json new file mode 100644 index 000000000..8432d97b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_blend.json b/src/generated/resources/assets/basemetals/items/bronze_blend.json new file mode 100644 index 000000000..f2d724410 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_block.json b/src/generated/resources/assets/basemetals/items/bronze_block.json new file mode 100644 index 000000000..b9ae82fd4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_bolt.json b/src/generated/resources/assets/basemetals/items/bronze_bolt.json new file mode 100644 index 000000000..02e960239 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_boots.json b/src/generated/resources/assets/basemetals/items/bronze_boots.json new file mode 100644 index 000000000..e40647328 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_bow.json b/src/generated/resources/assets/basemetals/items/bronze_bow.json new file mode 100644 index 000000000..955d9e808 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_bucket.json b/src/generated/resources/assets/basemetals/items/bronze_bucket.json new file mode 100644 index 000000000..0c899545e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -547505 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_button.json b/src/generated/resources/assets/basemetals/items/bronze_button.json new file mode 100644 index 000000000..e7af056d6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_chestplate.json b/src/generated/resources/assets/basemetals/items/bronze_chestplate.json new file mode 100644 index 000000000..5c16ae305 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_crackhammer.json b/src/generated/resources/assets/basemetals/items/bronze_crackhammer.json new file mode 100644 index 000000000..a77749954 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_crossbow.json b/src/generated/resources/assets/basemetals/items/bronze_crossbow.json new file mode 100644 index 000000000..a205b5bce --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_door.json b/src/generated/resources/assets/basemetals/items/bronze_door.json new file mode 100644 index 000000000..7632f3744 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_fishing_rod.json b/src/generated/resources/assets/basemetals/items/bronze_fishing_rod.json new file mode 100644 index 000000000..87a2fa780 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_gear.json b/src/generated/resources/assets/basemetals/items/bronze_gear.json new file mode 100644 index 000000000..bfb84e803 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_helmet.json b/src/generated/resources/assets/basemetals/items/bronze_helmet.json new file mode 100644 index 000000000..cf8a3cc7e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_hoe.json b/src/generated/resources/assets/basemetals/items/bronze_hoe.json new file mode 100644 index 000000000..125dd1500 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_horse_armor.json b/src/generated/resources/assets/basemetals/items/bronze_horse_armor.json new file mode 100644 index 000000000..7d5b4d2c6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_ingot.json b/src/generated/resources/assets/basemetals/items/bronze_ingot.json new file mode 100644 index 000000000..d59cb4caa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_leggings.json b/src/generated/resources/assets/basemetals/items/bronze_leggings.json new file mode 100644 index 000000000..549c36b4a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_lever.json b/src/generated/resources/assets/basemetals/items/bronze_lever.json new file mode 100644 index 000000000..288c4398f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_nugget.json b/src/generated/resources/assets/basemetals/items/bronze_nugget.json new file mode 100644 index 000000000..93d77e18b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_pickaxe.json b/src/generated/resources/assets/basemetals/items/bronze_pickaxe.json new file mode 100644 index 000000000..41c35d00b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_plate.json b/src/generated/resources/assets/basemetals/items/bronze_plate.json new file mode 100644 index 000000000..0335911ca --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_powder.json b/src/generated/resources/assets/basemetals/items/bronze_powder.json new file mode 100644 index 000000000..4456c9ea5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_pressure_plate.json b/src/generated/resources/assets/basemetals/items/bronze_pressure_plate.json new file mode 100644 index 000000000..ea6d6b0d7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_rod.json b/src/generated/resources/assets/basemetals/items/bronze_rod.json new file mode 100644 index 000000000..ffa71d84f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_scythe.json b/src/generated/resources/assets/basemetals/items/bronze_scythe.json new file mode 100644 index 000000000..f512101de --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_shears.json b/src/generated/resources/assets/basemetals/items/bronze_shears.json new file mode 100644 index 000000000..2ca4424bb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_shield.json b/src/generated/resources/assets/basemetals/items/bronze_shield.json new file mode 100644 index 000000000..5c81cb8b2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_shovel.json b/src/generated/resources/assets/basemetals/items/bronze_shovel.json new file mode 100644 index 000000000..e633f5170 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_slab.json b/src/generated/resources/assets/basemetals/items/bronze_slab.json new file mode 100644 index 000000000..167f34f28 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_smallblend.json b/src/generated/resources/assets/basemetals/items/bronze_smallblend.json new file mode 100644 index 000000000..7a44be573 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_smallpowder.json b/src/generated/resources/assets/basemetals/items/bronze_smallpowder.json new file mode 100644 index 000000000..b8b8927b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_stairs.json b/src/generated/resources/assets/basemetals/items/bronze_stairs.json new file mode 100644 index 000000000..2c0394a8b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_sword.json b/src/generated/resources/assets/basemetals/items/bronze_sword.json new file mode 100644 index 000000000..96737780e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_trapdoor.json b/src/generated/resources/assets/basemetals/items/bronze_trapdoor.json new file mode 100644 index 000000000..0f09f3c00 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/bronze_wall.json b/src/generated/resources/assets/basemetals/items/bronze_wall.json new file mode 100644 index 000000000..a3a1a9e04 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/bronze_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/bronze_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/charcoal.json b/src/generated/resources/assets/basemetals/items/charcoal.json new file mode 100644 index 000000000..dee028e93 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/charcoal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/charcoal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/charcoal_block.json b/src/generated/resources/assets/basemetals/items/charcoal_block.json new file mode 100644 index 000000000..d3f3db00b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/charcoal_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/charcoal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/charcoal_bucket.json b/src/generated/resources/assets/basemetals/items/charcoal_bucket.json new file mode 100644 index 000000000..4277a4926 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/charcoal_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/charcoal_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -14475496 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/charcoal_nugget.json b/src/generated/resources/assets/basemetals/items/charcoal_nugget.json new file mode 100644 index 000000000..1937a7f65 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/charcoal_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/charcoal_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/charcoal_powder.json b/src/generated/resources/assets/basemetals/items/charcoal_powder.json new file mode 100644 index 000000000..4c9b467b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/charcoal_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/charcoal_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/charcoal_smallpowder.json b/src/generated/resources/assets/basemetals/items/charcoal_smallpowder.json new file mode 100644 index 000000000..7551400e7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/charcoal_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/charcoal_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coal.json b/src/generated/resources/assets/basemetals/items/coal.json new file mode 100644 index 000000000..b1e4b58e1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coal_bucket.json b/src/generated/resources/assets/basemetals/items/coal_bucket.json new file mode 100644 index 000000000..9e0c42f66 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coal_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coal_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -15395563 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coal_nugget.json b/src/generated/resources/assets/basemetals/items/coal_nugget.json new file mode 100644 index 000000000..f118e8b3d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coal_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coal_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coal_powder.json b/src/generated/resources/assets/basemetals/items/coal_powder.json new file mode 100644 index 000000000..806b2b92b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coal_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coal_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coal_smallpowder.json b/src/generated/resources/assets/basemetals/items/coal_smallpowder.json new file mode 100644 index 000000000..1282415f8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coal_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coal_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron.json b/src/generated/resources/assets/basemetals/items/coldiron.json new file mode 100644 index 000000000..5e846c54d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_arrow.json b/src/generated/resources/assets/basemetals/items/coldiron_arrow.json new file mode 100644 index 000000000..139da8099 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_axe.json b/src/generated/resources/assets/basemetals/items/coldiron_axe.json new file mode 100644 index 000000000..2382b6c46 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_bars.json b/src/generated/resources/assets/basemetals/items/coldiron_bars.json new file mode 100644 index 000000000..61f382e18 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_block.json b/src/generated/resources/assets/basemetals/items/coldiron_block.json new file mode 100644 index 000000000..02d8b7247 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_bolt.json b/src/generated/resources/assets/basemetals/items/coldiron_bolt.json new file mode 100644 index 000000000..515c3e8bd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_boots.json b/src/generated/resources/assets/basemetals/items/coldiron_boots.json new file mode 100644 index 000000000..083b6c48e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_bow.json b/src/generated/resources/assets/basemetals/items/coldiron_bow.json new file mode 100644 index 000000000..3c01b285d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_bucket.json b/src/generated/resources/assets/basemetals/items/coldiron_bucket.json new file mode 100644 index 000000000..cbacbe810 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -3682576 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_button.json b/src/generated/resources/assets/basemetals/items/coldiron_button.json new file mode 100644 index 000000000..fd75b8a06 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_casing.json b/src/generated/resources/assets/basemetals/items/coldiron_casing.json new file mode 100644 index 000000000..93df05fdb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_chestplate.json b/src/generated/resources/assets/basemetals/items/coldiron_chestplate.json new file mode 100644 index 000000000..0ee73a83c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_clump.json b/src/generated/resources/assets/basemetals/items/coldiron_clump.json new file mode 100644 index 000000000..5ee5e9777 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_crackhammer.json b/src/generated/resources/assets/basemetals/items/coldiron_crackhammer.json new file mode 100644 index 000000000..16828958e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_crossbow.json b/src/generated/resources/assets/basemetals/items/coldiron_crossbow.json new file mode 100644 index 000000000..9c9efb29d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_crushed.json b/src/generated/resources/assets/basemetals/items/coldiron_crushed.json new file mode 100644 index 000000000..a5d547160 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_crushed_purified.json b/src/generated/resources/assets/basemetals/items/coldiron_crushed_purified.json new file mode 100644 index 000000000..b5298f742 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_crystal.json b/src/generated/resources/assets/basemetals/items/coldiron_crystal.json new file mode 100644 index 000000000..40ae0b39d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_dense_plate.json b/src/generated/resources/assets/basemetals/items/coldiron_dense_plate.json new file mode 100644 index 000000000..daa65a014 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_door.json b/src/generated/resources/assets/basemetals/items/coldiron_door.json new file mode 100644 index 000000000..cca69fb16 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_fishing_rod.json b/src/generated/resources/assets/basemetals/items/coldiron_fishing_rod.json new file mode 100644 index 000000000..59861616b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_gear.json b/src/generated/resources/assets/basemetals/items/coldiron_gear.json new file mode 100644 index 000000000..50ae4dc0a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_helmet.json b/src/generated/resources/assets/basemetals/items/coldiron_helmet.json new file mode 100644 index 000000000..f8433b178 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_hoe.json b/src/generated/resources/assets/basemetals/items/coldiron_hoe.json new file mode 100644 index 000000000..c6299fd75 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_horse_armor.json b/src/generated/resources/assets/basemetals/items/coldiron_horse_armor.json new file mode 100644 index 000000000..295509a1a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_ingot.json b/src/generated/resources/assets/basemetals/items/coldiron_ingot.json new file mode 100644 index 000000000..c71ee07c6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_leggings.json b/src/generated/resources/assets/basemetals/items/coldiron_leggings.json new file mode 100644 index 000000000..5ab613798 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_lever.json b/src/generated/resources/assets/basemetals/items/coldiron_lever.json new file mode 100644 index 000000000..e195c45c9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_nugget.json b/src/generated/resources/assets/basemetals/items/coldiron_nugget.json new file mode 100644 index 000000000..08ac5981b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_ore.json b/src/generated/resources/assets/basemetals/items/coldiron_ore.json new file mode 100644 index 000000000..928911f96 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_pickaxe.json b/src/generated/resources/assets/basemetals/items/coldiron_pickaxe.json new file mode 100644 index 000000000..ad472d385 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_plate.json b/src/generated/resources/assets/basemetals/items/coldiron_plate.json new file mode 100644 index 000000000..fefb3f607 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_powder.json b/src/generated/resources/assets/basemetals/items/coldiron_powder.json new file mode 100644 index 000000000..8e9715ffd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_powder_dirty.json b/src/generated/resources/assets/basemetals/items/coldiron_powder_dirty.json new file mode 100644 index 000000000..750174766 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_pressure_plate.json b/src/generated/resources/assets/basemetals/items/coldiron_pressure_plate.json new file mode 100644 index 000000000..33af95f09 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_raw.json b/src/generated/resources/assets/basemetals/items/coldiron_raw.json new file mode 100644 index 000000000..ca383dbc6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_rod.json b/src/generated/resources/assets/basemetals/items/coldiron_rod.json new file mode 100644 index 000000000..4c5bb6cf4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_scythe.json b/src/generated/resources/assets/basemetals/items/coldiron_scythe.json new file mode 100644 index 000000000..cc6fd0553 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_shard.json b/src/generated/resources/assets/basemetals/items/coldiron_shard.json new file mode 100644 index 000000000..f2832b8a5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_shears.json b/src/generated/resources/assets/basemetals/items/coldiron_shears.json new file mode 100644 index 000000000..1af6381d6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_shield.json b/src/generated/resources/assets/basemetals/items/coldiron_shield.json new file mode 100644 index 000000000..3b9f3c9e1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_shovel.json b/src/generated/resources/assets/basemetals/items/coldiron_shovel.json new file mode 100644 index 000000000..473bae42d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_slab.json b/src/generated/resources/assets/basemetals/items/coldiron_slab.json new file mode 100644 index 000000000..c84a01eb6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_smallpowder.json b/src/generated/resources/assets/basemetals/items/coldiron_smallpowder.json new file mode 100644 index 000000000..f63e05e8c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_stairs.json b/src/generated/resources/assets/basemetals/items/coldiron_stairs.json new file mode 100644 index 000000000..5ddb1f495 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_sword.json b/src/generated/resources/assets/basemetals/items/coldiron_sword.json new file mode 100644 index 000000000..af3a75722 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_trapdoor.json b/src/generated/resources/assets/basemetals/items/coldiron_trapdoor.json new file mode 100644 index 000000000..edf559508 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/coldiron_wall.json b/src/generated/resources/assets/basemetals/items/coldiron_wall.json new file mode 100644 index 000000000..ca76e9ccb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/coldiron_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/coldiron_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper.json b/src/generated/resources/assets/basemetals/items/copper.json new file mode 100644 index 000000000..e3a343847 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_arrow.json b/src/generated/resources/assets/basemetals/items/copper_arrow.json new file mode 100644 index 000000000..58c9df21a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_axe.json b/src/generated/resources/assets/basemetals/items/copper_axe.json new file mode 100644 index 000000000..fdf8e19aa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_bars.json b/src/generated/resources/assets/basemetals/items/copper_bars.json new file mode 100644 index 000000000..38fa390b1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_block.json b/src/generated/resources/assets/basemetals/items/copper_block.json new file mode 100644 index 000000000..2136a1190 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_bolt.json b/src/generated/resources/assets/basemetals/items/copper_bolt.json new file mode 100644 index 000000000..7058ee3c5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_boots.json b/src/generated/resources/assets/basemetals/items/copper_boots.json new file mode 100644 index 000000000..a9046282e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_bow.json b/src/generated/resources/assets/basemetals/items/copper_bow.json new file mode 100644 index 000000000..d03e44ba5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_bucket.json b/src/generated/resources/assets/basemetals/items/copper_bucket.json new file mode 100644 index 000000000..349c530c3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -24712 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_button.json b/src/generated/resources/assets/basemetals/items/copper_button.json new file mode 100644 index 000000000..62d7de8a1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_chestplate.json b/src/generated/resources/assets/basemetals/items/copper_chestplate.json new file mode 100644 index 000000000..324477b9a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_crackhammer.json b/src/generated/resources/assets/basemetals/items/copper_crackhammer.json new file mode 100644 index 000000000..61ee315f6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_crossbow.json b/src/generated/resources/assets/basemetals/items/copper_crossbow.json new file mode 100644 index 000000000..db0a3f289 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/copper_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/copper_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_door.json b/src/generated/resources/assets/basemetals/items/copper_door.json new file mode 100644 index 000000000..7d1fe03ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_fishing_rod.json b/src/generated/resources/assets/basemetals/items/copper_fishing_rod.json new file mode 100644 index 000000000..a387e2e22 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/copper_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/copper_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_gear.json b/src/generated/resources/assets/basemetals/items/copper_gear.json new file mode 100644 index 000000000..b48756586 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_helmet.json b/src/generated/resources/assets/basemetals/items/copper_helmet.json new file mode 100644 index 000000000..58556fd3f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_hoe.json b/src/generated/resources/assets/basemetals/items/copper_hoe.json new file mode 100644 index 000000000..ec697d594 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_horse_armor.json b/src/generated/resources/assets/basemetals/items/copper_horse_armor.json new file mode 100644 index 000000000..1ad84b555 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_ingot.json b/src/generated/resources/assets/basemetals/items/copper_ingot.json new file mode 100644 index 000000000..575f56efc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_leggings.json b/src/generated/resources/assets/basemetals/items/copper_leggings.json new file mode 100644 index 000000000..c930212e3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_lever.json b/src/generated/resources/assets/basemetals/items/copper_lever.json new file mode 100644 index 000000000..a350bd2e7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_nugget.json b/src/generated/resources/assets/basemetals/items/copper_nugget.json new file mode 100644 index 000000000..bf3750327 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_ore.json b/src/generated/resources/assets/basemetals/items/copper_ore.json new file mode 100644 index 000000000..9edf57750 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_pickaxe.json b/src/generated/resources/assets/basemetals/items/copper_pickaxe.json new file mode 100644 index 000000000..ad39c95a3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_plate.json b/src/generated/resources/assets/basemetals/items/copper_plate.json new file mode 100644 index 000000000..03b3a20f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_powder.json b/src/generated/resources/assets/basemetals/items/copper_powder.json new file mode 100644 index 000000000..1b14ef8bd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_pressure_plate.json b/src/generated/resources/assets/basemetals/items/copper_pressure_plate.json new file mode 100644 index 000000000..906f53f37 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_rod.json b/src/generated/resources/assets/basemetals/items/copper_rod.json new file mode 100644 index 000000000..fe5ae1580 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_scythe.json b/src/generated/resources/assets/basemetals/items/copper_scythe.json new file mode 100644 index 000000000..00314976d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_shears.json b/src/generated/resources/assets/basemetals/items/copper_shears.json new file mode 100644 index 000000000..1ddb40c3b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_shield.json b/src/generated/resources/assets/basemetals/items/copper_shield.json new file mode 100644 index 000000000..5ea111b21 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/copper_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/copper_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_shovel.json b/src/generated/resources/assets/basemetals/items/copper_shovel.json new file mode 100644 index 000000000..4ba3b50e3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_slab.json b/src/generated/resources/assets/basemetals/items/copper_slab.json new file mode 100644 index 000000000..48022d268 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_smallpowder.json b/src/generated/resources/assets/basemetals/items/copper_smallpowder.json new file mode 100644 index 000000000..61fbb7c69 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_stairs.json b/src/generated/resources/assets/basemetals/items/copper_stairs.json new file mode 100644 index 000000000..493be6e25 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_sword.json b/src/generated/resources/assets/basemetals/items/copper_sword.json new file mode 100644 index 000000000..f9933c7af --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_trapdoor.json b/src/generated/resources/assets/basemetals/items/copper_trapdoor.json new file mode 100644 index 000000000..43a2294f4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/copper_wall.json b/src/generated/resources/assets/basemetals/items/copper_wall.json new file mode 100644 index 000000000..0dbb59ff6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/copper_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/copper_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel.json b/src/generated/resources/assets/basemetals/items/cupronickel.json new file mode 100644 index 000000000..eff433300 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_arrow.json b/src/generated/resources/assets/basemetals/items/cupronickel_arrow.json new file mode 100644 index 000000000..e841363b6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_axe.json b/src/generated/resources/assets/basemetals/items/cupronickel_axe.json new file mode 100644 index 000000000..d1a531a7d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_bars.json b/src/generated/resources/assets/basemetals/items/cupronickel_bars.json new file mode 100644 index 000000000..a4c91baed --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_blend.json b/src/generated/resources/assets/basemetals/items/cupronickel_blend.json new file mode 100644 index 000000000..34a18a0fd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_block.json b/src/generated/resources/assets/basemetals/items/cupronickel_block.json new file mode 100644 index 000000000..e00a7a3f4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_bolt.json b/src/generated/resources/assets/basemetals/items/cupronickel_bolt.json new file mode 100644 index 000000000..7b0526f9f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_boots.json b/src/generated/resources/assets/basemetals/items/cupronickel_boots.json new file mode 100644 index 000000000..a0921587c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_bow.json b/src/generated/resources/assets/basemetals/items/cupronickel_bow.json new file mode 100644 index 000000000..ad768aa54 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_bucket.json b/src/generated/resources/assets/basemetals/items/cupronickel_bucket.json new file mode 100644 index 000000000..aac5555e6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -3626129 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_button.json b/src/generated/resources/assets/basemetals/items/cupronickel_button.json new file mode 100644 index 000000000..3fa359c01 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_chestplate.json b/src/generated/resources/assets/basemetals/items/cupronickel_chestplate.json new file mode 100644 index 000000000..9eea17bb4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_crackhammer.json b/src/generated/resources/assets/basemetals/items/cupronickel_crackhammer.json new file mode 100644 index 000000000..8a56b2591 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_crossbow.json b/src/generated/resources/assets/basemetals/items/cupronickel_crossbow.json new file mode 100644 index 000000000..cd6ea1a8f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_door.json b/src/generated/resources/assets/basemetals/items/cupronickel_door.json new file mode 100644 index 000000000..e48224c80 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_fishing_rod.json b/src/generated/resources/assets/basemetals/items/cupronickel_fishing_rod.json new file mode 100644 index 000000000..3542703f8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_gear.json b/src/generated/resources/assets/basemetals/items/cupronickel_gear.json new file mode 100644 index 000000000..d4d46b79f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_helmet.json b/src/generated/resources/assets/basemetals/items/cupronickel_helmet.json new file mode 100644 index 000000000..115ea0286 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_hoe.json b/src/generated/resources/assets/basemetals/items/cupronickel_hoe.json new file mode 100644 index 000000000..8a68e4757 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_horse_armor.json b/src/generated/resources/assets/basemetals/items/cupronickel_horse_armor.json new file mode 100644 index 000000000..b2dbffbbb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_ingot.json b/src/generated/resources/assets/basemetals/items/cupronickel_ingot.json new file mode 100644 index 000000000..7b03482cf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_leggings.json b/src/generated/resources/assets/basemetals/items/cupronickel_leggings.json new file mode 100644 index 000000000..5fe2bd32e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_lever.json b/src/generated/resources/assets/basemetals/items/cupronickel_lever.json new file mode 100644 index 000000000..5577ee5cf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_nugget.json b/src/generated/resources/assets/basemetals/items/cupronickel_nugget.json new file mode 100644 index 000000000..ddc7254ef --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_pickaxe.json b/src/generated/resources/assets/basemetals/items/cupronickel_pickaxe.json new file mode 100644 index 000000000..59d39f08f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_plate.json b/src/generated/resources/assets/basemetals/items/cupronickel_plate.json new file mode 100644 index 000000000..858b8a921 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_powder.json b/src/generated/resources/assets/basemetals/items/cupronickel_powder.json new file mode 100644 index 000000000..f344ebcac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_pressure_plate.json b/src/generated/resources/assets/basemetals/items/cupronickel_pressure_plate.json new file mode 100644 index 000000000..ee36dfc2d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_rod.json b/src/generated/resources/assets/basemetals/items/cupronickel_rod.json new file mode 100644 index 000000000..6e47d3627 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_scythe.json b/src/generated/resources/assets/basemetals/items/cupronickel_scythe.json new file mode 100644 index 000000000..9f0a6994d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_shears.json b/src/generated/resources/assets/basemetals/items/cupronickel_shears.json new file mode 100644 index 000000000..76938f664 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_shield.json b/src/generated/resources/assets/basemetals/items/cupronickel_shield.json new file mode 100644 index 000000000..1014f8c43 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_shovel.json b/src/generated/resources/assets/basemetals/items/cupronickel_shovel.json new file mode 100644 index 000000000..c19d51e4e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_slab.json b/src/generated/resources/assets/basemetals/items/cupronickel_slab.json new file mode 100644 index 000000000..6977f5819 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_smallblend.json b/src/generated/resources/assets/basemetals/items/cupronickel_smallblend.json new file mode 100644 index 000000000..c8a299ff0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_smallpowder.json b/src/generated/resources/assets/basemetals/items/cupronickel_smallpowder.json new file mode 100644 index 000000000..9e482fc35 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_stairs.json b/src/generated/resources/assets/basemetals/items/cupronickel_stairs.json new file mode 100644 index 000000000..89871ae2b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_sword.json b/src/generated/resources/assets/basemetals/items/cupronickel_sword.json new file mode 100644 index 000000000..a5d143bff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_trapdoor.json b/src/generated/resources/assets/basemetals/items/cupronickel_trapdoor.json new file mode 100644 index 000000000..f43b2b73f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/cupronickel_wall.json b/src/generated/resources/assets/basemetals/items/cupronickel_wall.json new file mode 100644 index 000000000..3e9a268e9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/cupronickel_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/cupronickel_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond.json b/src/generated/resources/assets/basemetals/items/diamond.json new file mode 100644 index 000000000..2c0a8dad1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_arrow.json b/src/generated/resources/assets/basemetals/items/diamond_arrow.json new file mode 100644 index 000000000..1fd1b6701 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_bars.json b/src/generated/resources/assets/basemetals/items/diamond_bars.json new file mode 100644 index 000000000..f8e7846ff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_blend.json b/src/generated/resources/assets/basemetals/items/diamond_blend.json new file mode 100644 index 000000000..c16d2b961 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_bolt.json b/src/generated/resources/assets/basemetals/items/diamond_bolt.json new file mode 100644 index 000000000..8dc16279c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_bow.json b/src/generated/resources/assets/basemetals/items/diamond_bow.json new file mode 100644 index 000000000..ef732dcf0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_bucket.json b/src/generated/resources/assets/basemetals/items/diamond_bucket.json new file mode 100644 index 000000000..3a385e307 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -7539487 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_button.json b/src/generated/resources/assets/basemetals/items/diamond_button.json new file mode 100644 index 000000000..9b2396ac8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_crackhammer.json b/src/generated/resources/assets/basemetals/items/diamond_crackhammer.json new file mode 100644 index 000000000..ef2081aba --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_crossbow.json b/src/generated/resources/assets/basemetals/items/diamond_crossbow.json new file mode 100644 index 000000000..5bd67a624 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_door.json b/src/generated/resources/assets/basemetals/items/diamond_door.json new file mode 100644 index 000000000..ae440b907 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_fishing_rod.json b/src/generated/resources/assets/basemetals/items/diamond_fishing_rod.json new file mode 100644 index 000000000..d79831038 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_gear.json b/src/generated/resources/assets/basemetals/items/diamond_gear.json new file mode 100644 index 000000000..bdec81b78 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_lever.json b/src/generated/resources/assets/basemetals/items/diamond_lever.json new file mode 100644 index 000000000..2a61a841e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_nugget.json b/src/generated/resources/assets/basemetals/items/diamond_nugget.json new file mode 100644 index 000000000..072a80f54 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_powder.json b/src/generated/resources/assets/basemetals/items/diamond_powder.json new file mode 100644 index 000000000..4907eb598 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_pressure_plate.json b/src/generated/resources/assets/basemetals/items/diamond_pressure_plate.json new file mode 100644 index 000000000..af26ec2b1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_rod.json b/src/generated/resources/assets/basemetals/items/diamond_rod.json new file mode 100644 index 000000000..bb6487bbd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_scythe.json b/src/generated/resources/assets/basemetals/items/diamond_scythe.json new file mode 100644 index 000000000..e484c83d9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_shears.json b/src/generated/resources/assets/basemetals/items/diamond_shears.json new file mode 100644 index 000000000..1fb8571bf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_shield.json b/src/generated/resources/assets/basemetals/items/diamond_shield.json new file mode 100644 index 000000000..99a78ad9c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_slab.json b/src/generated/resources/assets/basemetals/items/diamond_slab.json new file mode 100644 index 000000000..7016d67e9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_smallblend.json b/src/generated/resources/assets/basemetals/items/diamond_smallblend.json new file mode 100644 index 000000000..29d92e958 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_smallpowder.json b/src/generated/resources/assets/basemetals/items/diamond_smallpowder.json new file mode 100644 index 000000000..7dcb6ba1f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_stairs.json b/src/generated/resources/assets/basemetals/items/diamond_stairs.json new file mode 100644 index 000000000..bfdc8ec10 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_trapdoor.json b/src/generated/resources/assets/basemetals/items/diamond_trapdoor.json new file mode 100644 index 000000000..748e49154 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/diamond_wall.json b/src/generated/resources/assets/basemetals/items/diamond_wall.json new file mode 100644 index 000000000..08302031b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/diamond_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/diamond_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum.json b/src/generated/resources/assets/basemetals/items/electrum.json new file mode 100644 index 000000000..6063c1396 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_arrow.json b/src/generated/resources/assets/basemetals/items/electrum_arrow.json new file mode 100644 index 000000000..0d8c361e2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_axe.json b/src/generated/resources/assets/basemetals/items/electrum_axe.json new file mode 100644 index 000000000..46a92ddc2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_bars.json b/src/generated/resources/assets/basemetals/items/electrum_bars.json new file mode 100644 index 000000000..58a4d3357 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_blend.json b/src/generated/resources/assets/basemetals/items/electrum_blend.json new file mode 100644 index 000000000..243c59948 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_block.json b/src/generated/resources/assets/basemetals/items/electrum_block.json new file mode 100644 index 000000000..f759e7864 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_bolt.json b/src/generated/resources/assets/basemetals/items/electrum_bolt.json new file mode 100644 index 000000000..c2f1113e0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_boots.json b/src/generated/resources/assets/basemetals/items/electrum_boots.json new file mode 100644 index 000000000..b3e7eaca4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_bow.json b/src/generated/resources/assets/basemetals/items/electrum_bow.json new file mode 100644 index 000000000..84c2305c4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_bucket.json b/src/generated/resources/assets/basemetals/items/electrum_bucket.json new file mode 100644 index 000000000..d810c1a9b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -3405 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_button.json b/src/generated/resources/assets/basemetals/items/electrum_button.json new file mode 100644 index 000000000..2089e046f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_chestplate.json b/src/generated/resources/assets/basemetals/items/electrum_chestplate.json new file mode 100644 index 000000000..25b46a551 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_crackhammer.json b/src/generated/resources/assets/basemetals/items/electrum_crackhammer.json new file mode 100644 index 000000000..38fd49d3b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_crossbow.json b/src/generated/resources/assets/basemetals/items/electrum_crossbow.json new file mode 100644 index 000000000..8d40e9a9a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_door.json b/src/generated/resources/assets/basemetals/items/electrum_door.json new file mode 100644 index 000000000..82b0cec4d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_fishing_rod.json b/src/generated/resources/assets/basemetals/items/electrum_fishing_rod.json new file mode 100644 index 000000000..28f940469 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_gear.json b/src/generated/resources/assets/basemetals/items/electrum_gear.json new file mode 100644 index 000000000..f28aad5c0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_helmet.json b/src/generated/resources/assets/basemetals/items/electrum_helmet.json new file mode 100644 index 000000000..a05c0a872 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_hoe.json b/src/generated/resources/assets/basemetals/items/electrum_hoe.json new file mode 100644 index 000000000..e62152fea --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_horse_armor.json b/src/generated/resources/assets/basemetals/items/electrum_horse_armor.json new file mode 100644 index 000000000..34951292c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_ingot.json b/src/generated/resources/assets/basemetals/items/electrum_ingot.json new file mode 100644 index 000000000..eb9930353 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_leggings.json b/src/generated/resources/assets/basemetals/items/electrum_leggings.json new file mode 100644 index 000000000..9bfe7fdca --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_lever.json b/src/generated/resources/assets/basemetals/items/electrum_lever.json new file mode 100644 index 000000000..2e18ee649 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_nugget.json b/src/generated/resources/assets/basemetals/items/electrum_nugget.json new file mode 100644 index 000000000..f9501c09f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_pickaxe.json b/src/generated/resources/assets/basemetals/items/electrum_pickaxe.json new file mode 100644 index 000000000..f6aa90203 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_plate.json b/src/generated/resources/assets/basemetals/items/electrum_plate.json new file mode 100644 index 000000000..fda4e63b1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_powder.json b/src/generated/resources/assets/basemetals/items/electrum_powder.json new file mode 100644 index 000000000..16122ae5d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_pressure_plate.json b/src/generated/resources/assets/basemetals/items/electrum_pressure_plate.json new file mode 100644 index 000000000..408f5bf9b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_rod.json b/src/generated/resources/assets/basemetals/items/electrum_rod.json new file mode 100644 index 000000000..d3057f3a4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_scythe.json b/src/generated/resources/assets/basemetals/items/electrum_scythe.json new file mode 100644 index 000000000..9d297a495 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_shears.json b/src/generated/resources/assets/basemetals/items/electrum_shears.json new file mode 100644 index 000000000..eee339209 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_shield.json b/src/generated/resources/assets/basemetals/items/electrum_shield.json new file mode 100644 index 000000000..e643ec67d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_shovel.json b/src/generated/resources/assets/basemetals/items/electrum_shovel.json new file mode 100644 index 000000000..3ebc47579 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_slab.json b/src/generated/resources/assets/basemetals/items/electrum_slab.json new file mode 100644 index 000000000..0622a6133 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_smallblend.json b/src/generated/resources/assets/basemetals/items/electrum_smallblend.json new file mode 100644 index 000000000..c43f27d30 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_smallpowder.json b/src/generated/resources/assets/basemetals/items/electrum_smallpowder.json new file mode 100644 index 000000000..df64b5eb7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_stairs.json b/src/generated/resources/assets/basemetals/items/electrum_stairs.json new file mode 100644 index 000000000..c5b2d372c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_sword.json b/src/generated/resources/assets/basemetals/items/electrum_sword.json new file mode 100644 index 000000000..44ebdeca2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_trapdoor.json b/src/generated/resources/assets/basemetals/items/electrum_trapdoor.json new file mode 100644 index 000000000..266f59f95 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/electrum_wall.json b/src/generated/resources/assets/basemetals/items/electrum_wall.json new file mode 100644 index 000000000..563f2250a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/electrum_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/electrum_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald.json b/src/generated/resources/assets/basemetals/items/emerald.json new file mode 100644 index 000000000..e52df72a8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_arrow.json b/src/generated/resources/assets/basemetals/items/emerald_arrow.json new file mode 100644 index 000000000..94f6350bc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_axe.json b/src/generated/resources/assets/basemetals/items/emerald_axe.json new file mode 100644 index 000000000..379b913d4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_bars.json b/src/generated/resources/assets/basemetals/items/emerald_bars.json new file mode 100644 index 000000000..75ba4498a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_bolt.json b/src/generated/resources/assets/basemetals/items/emerald_bolt.json new file mode 100644 index 000000000..9eadf74f8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_boots.json b/src/generated/resources/assets/basemetals/items/emerald_boots.json new file mode 100644 index 000000000..a6b87714b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_bow.json b/src/generated/resources/assets/basemetals/items/emerald_bow.json new file mode 100644 index 000000000..9ce445a8a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_bucket.json b/src/generated/resources/assets/basemetals/items/emerald_bucket.json new file mode 100644 index 000000000..f14da9e0a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -8194388 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_button.json b/src/generated/resources/assets/basemetals/items/emerald_button.json new file mode 100644 index 000000000..df4dcf147 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_chestplate.json b/src/generated/resources/assets/basemetals/items/emerald_chestplate.json new file mode 100644 index 000000000..c8373f5b6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_crackhammer.json b/src/generated/resources/assets/basemetals/items/emerald_crackhammer.json new file mode 100644 index 000000000..def93a9b9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_crossbow.json b/src/generated/resources/assets/basemetals/items/emerald_crossbow.json new file mode 100644 index 000000000..47303ac81 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_door.json b/src/generated/resources/assets/basemetals/items/emerald_door.json new file mode 100644 index 000000000..d9b495605 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_fishing_rod.json b/src/generated/resources/assets/basemetals/items/emerald_fishing_rod.json new file mode 100644 index 000000000..c8a87d281 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_gear.json b/src/generated/resources/assets/basemetals/items/emerald_gear.json new file mode 100644 index 000000000..87d95dc4a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_helmet.json b/src/generated/resources/assets/basemetals/items/emerald_helmet.json new file mode 100644 index 000000000..212af29cb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_hoe.json b/src/generated/resources/assets/basemetals/items/emerald_hoe.json new file mode 100644 index 000000000..67839688c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_horse_armor.json b/src/generated/resources/assets/basemetals/items/emerald_horse_armor.json new file mode 100644 index 000000000..b1956966b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_leggings.json b/src/generated/resources/assets/basemetals/items/emerald_leggings.json new file mode 100644 index 000000000..3b0e29c09 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_lever.json b/src/generated/resources/assets/basemetals/items/emerald_lever.json new file mode 100644 index 000000000..506b8f698 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_nugget.json b/src/generated/resources/assets/basemetals/items/emerald_nugget.json new file mode 100644 index 000000000..952dc1242 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_pickaxe.json b/src/generated/resources/assets/basemetals/items/emerald_pickaxe.json new file mode 100644 index 000000000..7df0ce5ed --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_powder.json b/src/generated/resources/assets/basemetals/items/emerald_powder.json new file mode 100644 index 000000000..df99f36ec --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_pressure_plate.json b/src/generated/resources/assets/basemetals/items/emerald_pressure_plate.json new file mode 100644 index 000000000..cc3e3ffb7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_rod.json b/src/generated/resources/assets/basemetals/items/emerald_rod.json new file mode 100644 index 000000000..d2172d0e9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_scythe.json b/src/generated/resources/assets/basemetals/items/emerald_scythe.json new file mode 100644 index 000000000..409c55e72 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_shears.json b/src/generated/resources/assets/basemetals/items/emerald_shears.json new file mode 100644 index 000000000..3534fdfed --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_shield.json b/src/generated/resources/assets/basemetals/items/emerald_shield.json new file mode 100644 index 000000000..74dff9490 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_shovel.json b/src/generated/resources/assets/basemetals/items/emerald_shovel.json new file mode 100644 index 000000000..920c02104 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_slab.json b/src/generated/resources/assets/basemetals/items/emerald_slab.json new file mode 100644 index 000000000..a34a18b12 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_smallpowder.json b/src/generated/resources/assets/basemetals/items/emerald_smallpowder.json new file mode 100644 index 000000000..257439ddd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_stairs.json b/src/generated/resources/assets/basemetals/items/emerald_stairs.json new file mode 100644 index 000000000..0a261db91 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_sword.json b/src/generated/resources/assets/basemetals/items/emerald_sword.json new file mode 100644 index 000000000..70db5644f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_trapdoor.json b/src/generated/resources/assets/basemetals/items/emerald_trapdoor.json new file mode 100644 index 000000000..51381eb01 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/emerald_wall.json b/src/generated/resources/assets/basemetals/items/emerald_wall.json new file mode 100644 index 000000000..4b611f32c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/emerald_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/emerald_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/ender.json b/src/generated/resources/assets/basemetals/items/ender.json new file mode 100644 index 000000000..07f086e18 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/ender.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/ender" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/ender_bucket.json b/src/generated/resources/assets/basemetals/items/ender_bucket.json new file mode 100644 index 000000000..32b6e86a8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/ender_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/ender_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold.json b/src/generated/resources/assets/basemetals/items/gold.json new file mode 100644 index 000000000..8dfe069b5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_arrow.json b/src/generated/resources/assets/basemetals/items/gold_arrow.json new file mode 100644 index 000000000..de03e6c93 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_bars.json b/src/generated/resources/assets/basemetals/items/gold_bars.json new file mode 100644 index 000000000..9154e0cb7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_blend.json b/src/generated/resources/assets/basemetals/items/gold_blend.json new file mode 100644 index 000000000..4909681ab --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_bolt.json b/src/generated/resources/assets/basemetals/items/gold_bolt.json new file mode 100644 index 000000000..98a4af447 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_bow.json b/src/generated/resources/assets/basemetals/items/gold_bow.json new file mode 100644 index 000000000..71830c602 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_bucket.json b/src/generated/resources/assets/basemetals/items/gold_bucket.json new file mode 100644 index 000000000..1e0ac55a7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -117 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_button.json b/src/generated/resources/assets/basemetals/items/gold_button.json new file mode 100644 index 000000000..289c3a8c1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_crackhammer.json b/src/generated/resources/assets/basemetals/items/gold_crackhammer.json new file mode 100644 index 000000000..180957c49 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_crossbow.json b/src/generated/resources/assets/basemetals/items/gold_crossbow.json new file mode 100644 index 000000000..0e866d8f1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/gold_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/gold_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_door.json b/src/generated/resources/assets/basemetals/items/gold_door.json new file mode 100644 index 000000000..12a429fd5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_fishing_rod.json b/src/generated/resources/assets/basemetals/items/gold_fishing_rod.json new file mode 100644 index 000000000..3abb3d7da --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/gold_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/gold_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_gear.json b/src/generated/resources/assets/basemetals/items/gold_gear.json new file mode 100644 index 000000000..70eed1e2b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_lever.json b/src/generated/resources/assets/basemetals/items/gold_lever.json new file mode 100644 index 000000000..6671bd98c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_plate.json b/src/generated/resources/assets/basemetals/items/gold_plate.json new file mode 100644 index 000000000..ef07fda46 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_powder.json b/src/generated/resources/assets/basemetals/items/gold_powder.json new file mode 100644 index 000000000..e15446c78 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_rod.json b/src/generated/resources/assets/basemetals/items/gold_rod.json new file mode 100644 index 000000000..1c20e67c4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_scythe.json b/src/generated/resources/assets/basemetals/items/gold_scythe.json new file mode 100644 index 000000000..dd4115da1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_shears.json b/src/generated/resources/assets/basemetals/items/gold_shears.json new file mode 100644 index 000000000..caed8126f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_shield.json b/src/generated/resources/assets/basemetals/items/gold_shield.json new file mode 100644 index 000000000..9617549da --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/gold_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/gold_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_slab.json b/src/generated/resources/assets/basemetals/items/gold_slab.json new file mode 100644 index 000000000..d8e32591d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_smallblend.json b/src/generated/resources/assets/basemetals/items/gold_smallblend.json new file mode 100644 index 000000000..bce5527b3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_smallpowder.json b/src/generated/resources/assets/basemetals/items/gold_smallpowder.json new file mode 100644 index 000000000..bccb8e459 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_stairs.json b/src/generated/resources/assets/basemetals/items/gold_stairs.json new file mode 100644 index 000000000..ab1a97e13 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_trapdoor.json b/src/generated/resources/assets/basemetals/items/gold_trapdoor.json new file mode 100644 index 000000000..fab73b014 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/gold_wall.json b/src/generated/resources/assets/basemetals/items/gold_wall.json new file mode 100644 index 000000000..eac5f0788 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/gold_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/gold_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/human_detector.json b/src/generated/resources/assets/basemetals/items/human_detector.json new file mode 100644 index 000000000..7ced16803 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/human_detector.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/human_detector" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar.json b/src/generated/resources/assets/basemetals/items/invar.json new file mode 100644 index 000000000..e336c8d66 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_arrow.json b/src/generated/resources/assets/basemetals/items/invar_arrow.json new file mode 100644 index 000000000..3de74d5a9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_axe.json b/src/generated/resources/assets/basemetals/items/invar_axe.json new file mode 100644 index 000000000..0e6b44754 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_bars.json b/src/generated/resources/assets/basemetals/items/invar_bars.json new file mode 100644 index 000000000..0690da24a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_blend.json b/src/generated/resources/assets/basemetals/items/invar_blend.json new file mode 100644 index 000000000..dcadf758c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_block.json b/src/generated/resources/assets/basemetals/items/invar_block.json new file mode 100644 index 000000000..f483a676e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_bolt.json b/src/generated/resources/assets/basemetals/items/invar_bolt.json new file mode 100644 index 000000000..97349d22b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_boots.json b/src/generated/resources/assets/basemetals/items/invar_boots.json new file mode 100644 index 000000000..40114d6a2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_bow.json b/src/generated/resources/assets/basemetals/items/invar_bow.json new file mode 100644 index 000000000..2019069cc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_bucket.json b/src/generated/resources/assets/basemetals/items/invar_bucket.json new file mode 100644 index 000000000..48db042fb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -2961992 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_button.json b/src/generated/resources/assets/basemetals/items/invar_button.json new file mode 100644 index 000000000..a9d3ad1ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_chestplate.json b/src/generated/resources/assets/basemetals/items/invar_chestplate.json new file mode 100644 index 000000000..927287378 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_crackhammer.json b/src/generated/resources/assets/basemetals/items/invar_crackhammer.json new file mode 100644 index 000000000..a9f85fffd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_crossbow.json b/src/generated/resources/assets/basemetals/items/invar_crossbow.json new file mode 100644 index 000000000..b14d14a19 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/invar_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/invar_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_door.json b/src/generated/resources/assets/basemetals/items/invar_door.json new file mode 100644 index 000000000..7a31b3d1a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_fishing_rod.json b/src/generated/resources/assets/basemetals/items/invar_fishing_rod.json new file mode 100644 index 000000000..d80ca3c74 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/invar_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/invar_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_gear.json b/src/generated/resources/assets/basemetals/items/invar_gear.json new file mode 100644 index 000000000..3921947a6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_helmet.json b/src/generated/resources/assets/basemetals/items/invar_helmet.json new file mode 100644 index 000000000..d9cff5083 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_hoe.json b/src/generated/resources/assets/basemetals/items/invar_hoe.json new file mode 100644 index 000000000..676b79984 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_horse_armor.json b/src/generated/resources/assets/basemetals/items/invar_horse_armor.json new file mode 100644 index 000000000..451b83d50 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_ingot.json b/src/generated/resources/assets/basemetals/items/invar_ingot.json new file mode 100644 index 000000000..5a8996df9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_leggings.json b/src/generated/resources/assets/basemetals/items/invar_leggings.json new file mode 100644 index 000000000..1fc43b162 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_lever.json b/src/generated/resources/assets/basemetals/items/invar_lever.json new file mode 100644 index 000000000..ff52c177a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_nugget.json b/src/generated/resources/assets/basemetals/items/invar_nugget.json new file mode 100644 index 000000000..cc1b91f46 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_pickaxe.json b/src/generated/resources/assets/basemetals/items/invar_pickaxe.json new file mode 100644 index 000000000..86c96a2e4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_plate.json b/src/generated/resources/assets/basemetals/items/invar_plate.json new file mode 100644 index 000000000..77f9f7db3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_powder.json b/src/generated/resources/assets/basemetals/items/invar_powder.json new file mode 100644 index 000000000..15a6df3f1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_pressure_plate.json b/src/generated/resources/assets/basemetals/items/invar_pressure_plate.json new file mode 100644 index 000000000..e7cdfdedd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_rod.json b/src/generated/resources/assets/basemetals/items/invar_rod.json new file mode 100644 index 000000000..8604cdc2c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_scythe.json b/src/generated/resources/assets/basemetals/items/invar_scythe.json new file mode 100644 index 000000000..016ef5857 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_shears.json b/src/generated/resources/assets/basemetals/items/invar_shears.json new file mode 100644 index 000000000..eea9ea16d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_shield.json b/src/generated/resources/assets/basemetals/items/invar_shield.json new file mode 100644 index 000000000..c5311612b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/invar_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/invar_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_shovel.json b/src/generated/resources/assets/basemetals/items/invar_shovel.json new file mode 100644 index 000000000..83769a866 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_slab.json b/src/generated/resources/assets/basemetals/items/invar_slab.json new file mode 100644 index 000000000..52f40c2e1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_smallblend.json b/src/generated/resources/assets/basemetals/items/invar_smallblend.json new file mode 100644 index 000000000..6c33eafa9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_smallpowder.json b/src/generated/resources/assets/basemetals/items/invar_smallpowder.json new file mode 100644 index 000000000..16a01b0b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_stairs.json b/src/generated/resources/assets/basemetals/items/invar_stairs.json new file mode 100644 index 000000000..0bd5c2e84 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_sword.json b/src/generated/resources/assets/basemetals/items/invar_sword.json new file mode 100644 index 000000000..6993677f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_trapdoor.json b/src/generated/resources/assets/basemetals/items/invar_trapdoor.json new file mode 100644 index 000000000..6798e02af --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/invar_wall.json b/src/generated/resources/assets/basemetals/items/invar_wall.json new file mode 100644 index 000000000..45472b9f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/invar_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/invar_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron.json b/src/generated/resources/assets/basemetals/items/iron.json new file mode 100644 index 000000000..a507804f1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_arrow.json b/src/generated/resources/assets/basemetals/items/iron_arrow.json new file mode 100644 index 000000000..d3389fe6b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_blend.json b/src/generated/resources/assets/basemetals/items/iron_blend.json new file mode 100644 index 000000000..8494baa59 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_bolt.json b/src/generated/resources/assets/basemetals/items/iron_bolt.json new file mode 100644 index 000000000..6fde389da --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_bow.json b/src/generated/resources/assets/basemetals/items/iron_bow.json new file mode 100644 index 000000000..976d328a6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/iron_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/iron_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_bucket.json b/src/generated/resources/assets/basemetals/items/iron_bucket.json new file mode 100644 index 000000000..52bb608b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -2565928 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_button.json b/src/generated/resources/assets/basemetals/items/iron_button.json new file mode 100644 index 000000000..d77ed4af4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_crackhammer.json b/src/generated/resources/assets/basemetals/items/iron_crackhammer.json new file mode 100644 index 000000000..4fdc79964 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_crossbow.json b/src/generated/resources/assets/basemetals/items/iron_crossbow.json new file mode 100644 index 000000000..b7c61bb4d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/iron_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/iron_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_fishing_rod.json b/src/generated/resources/assets/basemetals/items/iron_fishing_rod.json new file mode 100644 index 000000000..b19cf5c23 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/iron_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/iron_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_gear.json b/src/generated/resources/assets/basemetals/items/iron_gear.json new file mode 100644 index 000000000..ef2cc339e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_lever.json b/src/generated/resources/assets/basemetals/items/iron_lever.json new file mode 100644 index 000000000..e733e6936 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_plate.json b/src/generated/resources/assets/basemetals/items/iron_plate.json new file mode 100644 index 000000000..1497fe2fc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_powder.json b/src/generated/resources/assets/basemetals/items/iron_powder.json new file mode 100644 index 000000000..8fb6684bb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_rod.json b/src/generated/resources/assets/basemetals/items/iron_rod.json new file mode 100644 index 000000000..60fc607e4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_scythe.json b/src/generated/resources/assets/basemetals/items/iron_scythe.json new file mode 100644 index 000000000..39fac0fb8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_shield.json b/src/generated/resources/assets/basemetals/items/iron_shield.json new file mode 100644 index 000000000..c56f07aaa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/iron_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/iron_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_slab.json b/src/generated/resources/assets/basemetals/items/iron_slab.json new file mode 100644 index 000000000..c2883ed17 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_smallblend.json b/src/generated/resources/assets/basemetals/items/iron_smallblend.json new file mode 100644 index 000000000..82be7ead7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_smallpowder.json b/src/generated/resources/assets/basemetals/items/iron_smallpowder.json new file mode 100644 index 000000000..d60393e6b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_stairs.json b/src/generated/resources/assets/basemetals/items/iron_stairs.json new file mode 100644 index 000000000..7854cf2dc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/iron_wall.json b/src/generated/resources/assets/basemetals/items/iron_wall.json new file mode 100644 index 000000000..e91fe1751 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/iron_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/iron_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lapis.json b/src/generated/resources/assets/basemetals/items/lapis.json new file mode 100644 index 000000000..39c64a96b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lapis.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lapis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lapis_bucket.json b/src/generated/resources/assets/basemetals/items/lapis_bucket.json new file mode 100644 index 000000000..98a900d0a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lapis_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lapis_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -14261860 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lapis_smallpowder.json b/src/generated/resources/assets/basemetals/items/lapis_smallpowder.json new file mode 100644 index 000000000..6ea3fffec --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lapis_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lapis_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead.json b/src/generated/resources/assets/basemetals/items/lead.json new file mode 100644 index 000000000..638ba5567 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_arrow.json b/src/generated/resources/assets/basemetals/items/lead_arrow.json new file mode 100644 index 000000000..ffcd1008c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_axe.json b/src/generated/resources/assets/basemetals/items/lead_axe.json new file mode 100644 index 000000000..6427a7511 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_bars.json b/src/generated/resources/assets/basemetals/items/lead_bars.json new file mode 100644 index 000000000..434c54779 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_block.json b/src/generated/resources/assets/basemetals/items/lead_block.json new file mode 100644 index 000000000..21d72fb2d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_bolt.json b/src/generated/resources/assets/basemetals/items/lead_bolt.json new file mode 100644 index 000000000..0218bd30c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_boots.json b/src/generated/resources/assets/basemetals/items/lead_boots.json new file mode 100644 index 000000000..7cc42e4db --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_bow.json b/src/generated/resources/assets/basemetals/items/lead_bow.json new file mode 100644 index 000000000..b00581b2e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_bucket.json b/src/generated/resources/assets/basemetals/items/lead_bucket.json new file mode 100644 index 000000000..136b7b32b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -8684677 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_button.json b/src/generated/resources/assets/basemetals/items/lead_button.json new file mode 100644 index 000000000..05b18b0c0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_chestplate.json b/src/generated/resources/assets/basemetals/items/lead_chestplate.json new file mode 100644 index 000000000..9afc08fbd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_crackhammer.json b/src/generated/resources/assets/basemetals/items/lead_crackhammer.json new file mode 100644 index 000000000..39813e5b2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_crossbow.json b/src/generated/resources/assets/basemetals/items/lead_crossbow.json new file mode 100644 index 000000000..18c5fc1cc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/lead_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/lead_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_door.json b/src/generated/resources/assets/basemetals/items/lead_door.json new file mode 100644 index 000000000..9bca24cd1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_fishing_rod.json b/src/generated/resources/assets/basemetals/items/lead_fishing_rod.json new file mode 100644 index 000000000..d0cd371b2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/lead_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/lead_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_gear.json b/src/generated/resources/assets/basemetals/items/lead_gear.json new file mode 100644 index 000000000..efd94463d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_helmet.json b/src/generated/resources/assets/basemetals/items/lead_helmet.json new file mode 100644 index 000000000..decfbe643 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_hoe.json b/src/generated/resources/assets/basemetals/items/lead_hoe.json new file mode 100644 index 000000000..db6b36e65 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_horse_armor.json b/src/generated/resources/assets/basemetals/items/lead_horse_armor.json new file mode 100644 index 000000000..e71a16825 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_ingot.json b/src/generated/resources/assets/basemetals/items/lead_ingot.json new file mode 100644 index 000000000..83115a4e9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_leggings.json b/src/generated/resources/assets/basemetals/items/lead_leggings.json new file mode 100644 index 000000000..cf79bb669 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_lever.json b/src/generated/resources/assets/basemetals/items/lead_lever.json new file mode 100644 index 000000000..69edd690e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_nugget.json b/src/generated/resources/assets/basemetals/items/lead_nugget.json new file mode 100644 index 000000000..678829ad2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_ore.json b/src/generated/resources/assets/basemetals/items/lead_ore.json new file mode 100644 index 000000000..d13233a46 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_pickaxe.json b/src/generated/resources/assets/basemetals/items/lead_pickaxe.json new file mode 100644 index 000000000..6d5e2ade8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_plate.json b/src/generated/resources/assets/basemetals/items/lead_plate.json new file mode 100644 index 000000000..233620f6c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_powder.json b/src/generated/resources/assets/basemetals/items/lead_powder.json new file mode 100644 index 000000000..75eafffe8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_pressure_plate.json b/src/generated/resources/assets/basemetals/items/lead_pressure_plate.json new file mode 100644 index 000000000..b8f308330 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_raw.json b/src/generated/resources/assets/basemetals/items/lead_raw.json new file mode 100644 index 000000000..3a29ff047 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_rod.json b/src/generated/resources/assets/basemetals/items/lead_rod.json new file mode 100644 index 000000000..686d0fc21 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_scythe.json b/src/generated/resources/assets/basemetals/items/lead_scythe.json new file mode 100644 index 000000000..073c2fe4c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_shears.json b/src/generated/resources/assets/basemetals/items/lead_shears.json new file mode 100644 index 000000000..078bef1b1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_shield.json b/src/generated/resources/assets/basemetals/items/lead_shield.json new file mode 100644 index 000000000..f14e7e6da --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/lead_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/lead_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_shovel.json b/src/generated/resources/assets/basemetals/items/lead_shovel.json new file mode 100644 index 000000000..876021ece --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_slab.json b/src/generated/resources/assets/basemetals/items/lead_slab.json new file mode 100644 index 000000000..ece2bd538 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_smallpowder.json b/src/generated/resources/assets/basemetals/items/lead_smallpowder.json new file mode 100644 index 000000000..5d395b72a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_stairs.json b/src/generated/resources/assets/basemetals/items/lead_stairs.json new file mode 100644 index 000000000..5aedc2442 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_sword.json b/src/generated/resources/assets/basemetals/items/lead_sword.json new file mode 100644 index 000000000..023008312 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_trapdoor.json b/src/generated/resources/assets/basemetals/items/lead_trapdoor.json new file mode 100644 index 000000000..38c57b701 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/lead_wall.json b/src/generated/resources/assets/basemetals/items/lead_wall.json new file mode 100644 index 000000000..b57aed429 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/lead_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/lead_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury.json b/src/generated/resources/assets/basemetals/items/mercury.json new file mode 100644 index 000000000..4f903098d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_bucket.json b/src/generated/resources/assets/basemetals/items/mercury_bucket.json new file mode 100644 index 000000000..59011d157 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1907998 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_ingot.json b/src/generated/resources/assets/basemetals/items/mercury_ingot.json new file mode 100644 index 000000000..fea354111 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_nugget.json b/src/generated/resources/assets/basemetals/items/mercury_nugget.json new file mode 100644 index 000000000..f6b0a2cba --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_ore.json b/src/generated/resources/assets/basemetals/items/mercury_ore.json new file mode 100644 index 000000000..ad779496f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_powder.json b/src/generated/resources/assets/basemetals/items/mercury_powder.json new file mode 100644 index 000000000..2af0c82ce --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_raw.json b/src/generated/resources/assets/basemetals/items/mercury_raw.json new file mode 100644 index 000000000..d0f50cc81 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mercury_smallpowder.json b/src/generated/resources/assets/basemetals/items/mercury_smallpowder.json new file mode 100644 index 000000000..b94bb5f1a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mercury_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mercury_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril.json b/src/generated/resources/assets/basemetals/items/mithril.json new file mode 100644 index 000000000..2b8d1aef5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_arrow.json b/src/generated/resources/assets/basemetals/items/mithril_arrow.json new file mode 100644 index 000000000..cd858882d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_axe.json b/src/generated/resources/assets/basemetals/items/mithril_axe.json new file mode 100644 index 000000000..352acc9be --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_bars.json b/src/generated/resources/assets/basemetals/items/mithril_bars.json new file mode 100644 index 000000000..6e808def4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_blend.json b/src/generated/resources/assets/basemetals/items/mithril_blend.json new file mode 100644 index 000000000..f7688a335 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_block.json b/src/generated/resources/assets/basemetals/items/mithril_block.json new file mode 100644 index 000000000..4a538bce3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_bolt.json b/src/generated/resources/assets/basemetals/items/mithril_bolt.json new file mode 100644 index 000000000..f0ead74b4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_boots.json b/src/generated/resources/assets/basemetals/items/mithril_boots.json new file mode 100644 index 000000000..da291f157 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_bow.json b/src/generated/resources/assets/basemetals/items/mithril_bow.json new file mode 100644 index 000000000..c14dedeb2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_bucket.json b/src/generated/resources/assets/basemetals/items/mithril_bucket.json new file mode 100644 index 000000000..46bd95874 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -720897 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_button.json b/src/generated/resources/assets/basemetals/items/mithril_button.json new file mode 100644 index 000000000..2498c7179 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_chestplate.json b/src/generated/resources/assets/basemetals/items/mithril_chestplate.json new file mode 100644 index 000000000..376f71511 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_crackhammer.json b/src/generated/resources/assets/basemetals/items/mithril_crackhammer.json new file mode 100644 index 000000000..b64bc1cf1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_crossbow.json b/src/generated/resources/assets/basemetals/items/mithril_crossbow.json new file mode 100644 index 000000000..c5186f1bf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_door.json b/src/generated/resources/assets/basemetals/items/mithril_door.json new file mode 100644 index 000000000..e411f9347 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_fishing_rod.json b/src/generated/resources/assets/basemetals/items/mithril_fishing_rod.json new file mode 100644 index 000000000..c0f11bb2d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_gear.json b/src/generated/resources/assets/basemetals/items/mithril_gear.json new file mode 100644 index 000000000..d34583922 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_helmet.json b/src/generated/resources/assets/basemetals/items/mithril_helmet.json new file mode 100644 index 000000000..795ad078b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_hoe.json b/src/generated/resources/assets/basemetals/items/mithril_hoe.json new file mode 100644 index 000000000..e1f1fa3a3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_horse_armor.json b/src/generated/resources/assets/basemetals/items/mithril_horse_armor.json new file mode 100644 index 000000000..582d042f4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_ingot.json b/src/generated/resources/assets/basemetals/items/mithril_ingot.json new file mode 100644 index 000000000..c4aca99e4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_leggings.json b/src/generated/resources/assets/basemetals/items/mithril_leggings.json new file mode 100644 index 000000000..a1a4c098e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_lever.json b/src/generated/resources/assets/basemetals/items/mithril_lever.json new file mode 100644 index 000000000..16b7751ce --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_nugget.json b/src/generated/resources/assets/basemetals/items/mithril_nugget.json new file mode 100644 index 000000000..6effcc8c4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_pickaxe.json b/src/generated/resources/assets/basemetals/items/mithril_pickaxe.json new file mode 100644 index 000000000..34af4bcc9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_plate.json b/src/generated/resources/assets/basemetals/items/mithril_plate.json new file mode 100644 index 000000000..34445772b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_powder.json b/src/generated/resources/assets/basemetals/items/mithril_powder.json new file mode 100644 index 000000000..bbad66822 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_pressure_plate.json b/src/generated/resources/assets/basemetals/items/mithril_pressure_plate.json new file mode 100644 index 000000000..612398d49 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_rod.json b/src/generated/resources/assets/basemetals/items/mithril_rod.json new file mode 100644 index 000000000..1864cc264 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_scythe.json b/src/generated/resources/assets/basemetals/items/mithril_scythe.json new file mode 100644 index 000000000..576d6c53f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_shears.json b/src/generated/resources/assets/basemetals/items/mithril_shears.json new file mode 100644 index 000000000..319754ede --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_shield.json b/src/generated/resources/assets/basemetals/items/mithril_shield.json new file mode 100644 index 000000000..767808b1a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_shovel.json b/src/generated/resources/assets/basemetals/items/mithril_shovel.json new file mode 100644 index 000000000..c1e53f42b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_slab.json b/src/generated/resources/assets/basemetals/items/mithril_slab.json new file mode 100644 index 000000000..df14a2534 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_smallblend.json b/src/generated/resources/assets/basemetals/items/mithril_smallblend.json new file mode 100644 index 000000000..ab1463249 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_smallpowder.json b/src/generated/resources/assets/basemetals/items/mithril_smallpowder.json new file mode 100644 index 000000000..b162dc0f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_stairs.json b/src/generated/resources/assets/basemetals/items/mithril_stairs.json new file mode 100644 index 000000000..a7c1badc8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_sword.json b/src/generated/resources/assets/basemetals/items/mithril_sword.json new file mode 100644 index 000000000..653fe8684 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_trapdoor.json b/src/generated/resources/assets/basemetals/items/mithril_trapdoor.json new file mode 100644 index 000000000..649a0f572 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/mithril_wall.json b/src/generated/resources/assets/basemetals/items/mithril_wall.json new file mode 100644 index 000000000..06fb28fea --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/mithril_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/mithril_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel.json b/src/generated/resources/assets/basemetals/items/nickel.json new file mode 100644 index 000000000..5516ba5db --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_arrow.json b/src/generated/resources/assets/basemetals/items/nickel_arrow.json new file mode 100644 index 000000000..1ab64cccf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_axe.json b/src/generated/resources/assets/basemetals/items/nickel_axe.json new file mode 100644 index 000000000..b3b5c6ebb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_bars.json b/src/generated/resources/assets/basemetals/items/nickel_bars.json new file mode 100644 index 000000000..a52ea3db1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_block.json b/src/generated/resources/assets/basemetals/items/nickel_block.json new file mode 100644 index 000000000..b507fecf7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_bolt.json b/src/generated/resources/assets/basemetals/items/nickel_bolt.json new file mode 100644 index 000000000..bfc636308 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_boots.json b/src/generated/resources/assets/basemetals/items/nickel_boots.json new file mode 100644 index 000000000..24a1b739a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_bow.json b/src/generated/resources/assets/basemetals/items/nickel_bow.json new file mode 100644 index 000000000..8894e1c78 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_bucket.json b/src/generated/resources/assets/basemetals/items/nickel_bucket.json new file mode 100644 index 000000000..32737baef --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1114133 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_button.json b/src/generated/resources/assets/basemetals/items/nickel_button.json new file mode 100644 index 000000000..d746aec36 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_casing.json b/src/generated/resources/assets/basemetals/items/nickel_casing.json new file mode 100644 index 000000000..8b092c4e9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_chestplate.json b/src/generated/resources/assets/basemetals/items/nickel_chestplate.json new file mode 100644 index 000000000..53aa87ad1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_clump.json b/src/generated/resources/assets/basemetals/items/nickel_clump.json new file mode 100644 index 000000000..1e44a32d5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_crackhammer.json b/src/generated/resources/assets/basemetals/items/nickel_crackhammer.json new file mode 100644 index 000000000..75e4e3530 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_crossbow.json b/src/generated/resources/assets/basemetals/items/nickel_crossbow.json new file mode 100644 index 000000000..8d49ac65f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_crushed.json b/src/generated/resources/assets/basemetals/items/nickel_crushed.json new file mode 100644 index 000000000..3d02303df --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_crushed_purified.json b/src/generated/resources/assets/basemetals/items/nickel_crushed_purified.json new file mode 100644 index 000000000..617c12e34 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_crystal.json b/src/generated/resources/assets/basemetals/items/nickel_crystal.json new file mode 100644 index 000000000..303c4855d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_dense_plate.json b/src/generated/resources/assets/basemetals/items/nickel_dense_plate.json new file mode 100644 index 000000000..29652aa1a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_door.json b/src/generated/resources/assets/basemetals/items/nickel_door.json new file mode 100644 index 000000000..f9aa62251 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_fishing_rod.json b/src/generated/resources/assets/basemetals/items/nickel_fishing_rod.json new file mode 100644 index 000000000..250e818b9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_gear.json b/src/generated/resources/assets/basemetals/items/nickel_gear.json new file mode 100644 index 000000000..ef10e5056 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_helmet.json b/src/generated/resources/assets/basemetals/items/nickel_helmet.json new file mode 100644 index 000000000..74f1aa9c6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_hoe.json b/src/generated/resources/assets/basemetals/items/nickel_hoe.json new file mode 100644 index 000000000..6bcfec847 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_horse_armor.json b/src/generated/resources/assets/basemetals/items/nickel_horse_armor.json new file mode 100644 index 000000000..75c902542 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_ingot.json b/src/generated/resources/assets/basemetals/items/nickel_ingot.json new file mode 100644 index 000000000..a4a648533 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_leggings.json b/src/generated/resources/assets/basemetals/items/nickel_leggings.json new file mode 100644 index 000000000..a5ef2776c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_lever.json b/src/generated/resources/assets/basemetals/items/nickel_lever.json new file mode 100644 index 000000000..b8bc89e43 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_nugget.json b/src/generated/resources/assets/basemetals/items/nickel_nugget.json new file mode 100644 index 000000000..3b9360d6d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_ore.json b/src/generated/resources/assets/basemetals/items/nickel_ore.json new file mode 100644 index 000000000..7b33859f6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_pickaxe.json b/src/generated/resources/assets/basemetals/items/nickel_pickaxe.json new file mode 100644 index 000000000..e5b54326e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_plate.json b/src/generated/resources/assets/basemetals/items/nickel_plate.json new file mode 100644 index 000000000..d934d85f5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_powder.json b/src/generated/resources/assets/basemetals/items/nickel_powder.json new file mode 100644 index 000000000..bf1352b70 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_powder_dirty.json b/src/generated/resources/assets/basemetals/items/nickel_powder_dirty.json new file mode 100644 index 000000000..34fea890a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_pressure_plate.json b/src/generated/resources/assets/basemetals/items/nickel_pressure_plate.json new file mode 100644 index 000000000..88ab1d067 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_raw.json b/src/generated/resources/assets/basemetals/items/nickel_raw.json new file mode 100644 index 000000000..595af55cb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_rod.json b/src/generated/resources/assets/basemetals/items/nickel_rod.json new file mode 100644 index 000000000..7b87975ca --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_scythe.json b/src/generated/resources/assets/basemetals/items/nickel_scythe.json new file mode 100644 index 000000000..e126cf45d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_shard.json b/src/generated/resources/assets/basemetals/items/nickel_shard.json new file mode 100644 index 000000000..3c71efec0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_shears.json b/src/generated/resources/assets/basemetals/items/nickel_shears.json new file mode 100644 index 000000000..18efe321e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_shield.json b/src/generated/resources/assets/basemetals/items/nickel_shield.json new file mode 100644 index 000000000..91c1920c3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_shovel.json b/src/generated/resources/assets/basemetals/items/nickel_shovel.json new file mode 100644 index 000000000..516df51cd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_slab.json b/src/generated/resources/assets/basemetals/items/nickel_slab.json new file mode 100644 index 000000000..99f917db1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_smallpowder.json b/src/generated/resources/assets/basemetals/items/nickel_smallpowder.json new file mode 100644 index 000000000..7c342f0df --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_stairs.json b/src/generated/resources/assets/basemetals/items/nickel_stairs.json new file mode 100644 index 000000000..ad457a966 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_sword.json b/src/generated/resources/assets/basemetals/items/nickel_sword.json new file mode 100644 index 000000000..875a4e930 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_trapdoor.json b/src/generated/resources/assets/basemetals/items/nickel_trapdoor.json new file mode 100644 index 000000000..b4910eb2b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/nickel_wall.json b/src/generated/resources/assets/basemetals/items/nickel_wall.json new file mode 100644 index 000000000..f8d9f2684 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/nickel_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/nickel_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian.json b/src/generated/resources/assets/basemetals/items/obsidian.json new file mode 100644 index 000000000..161fa3551 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_arrow.json b/src/generated/resources/assets/basemetals/items/obsidian_arrow.json new file mode 100644 index 000000000..f3567a37c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_axe.json b/src/generated/resources/assets/basemetals/items/obsidian_axe.json new file mode 100644 index 000000000..6788a6149 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_bars.json b/src/generated/resources/assets/basemetals/items/obsidian_bars.json new file mode 100644 index 000000000..3aab6ba5a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_bolt.json b/src/generated/resources/assets/basemetals/items/obsidian_bolt.json new file mode 100644 index 000000000..289bbfb91 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_boots.json b/src/generated/resources/assets/basemetals/items/obsidian_boots.json new file mode 100644 index 000000000..f4057386f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_bow.json b/src/generated/resources/assets/basemetals/items/obsidian_bow.json new file mode 100644 index 000000000..f56770b99 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_bucket.json b/src/generated/resources/assets/basemetals/items/obsidian_bucket.json new file mode 100644 index 000000000..dd29d55a6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -15724519 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_button.json b/src/generated/resources/assets/basemetals/items/obsidian_button.json new file mode 100644 index 000000000..929c51c3c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_chestplate.json b/src/generated/resources/assets/basemetals/items/obsidian_chestplate.json new file mode 100644 index 000000000..683b0fbec --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_crackhammer.json b/src/generated/resources/assets/basemetals/items/obsidian_crackhammer.json new file mode 100644 index 000000000..53bb0a7c4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_crossbow.json b/src/generated/resources/assets/basemetals/items/obsidian_crossbow.json new file mode 100644 index 000000000..8c297fdcd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_door.json b/src/generated/resources/assets/basemetals/items/obsidian_door.json new file mode 100644 index 000000000..b7716e2e2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_fishing_rod.json b/src/generated/resources/assets/basemetals/items/obsidian_fishing_rod.json new file mode 100644 index 000000000..bd218a392 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_gear.json b/src/generated/resources/assets/basemetals/items/obsidian_gear.json new file mode 100644 index 000000000..814bc791e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_helmet.json b/src/generated/resources/assets/basemetals/items/obsidian_helmet.json new file mode 100644 index 000000000..47da716f3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_hoe.json b/src/generated/resources/assets/basemetals/items/obsidian_hoe.json new file mode 100644 index 000000000..275193606 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_horse_armor.json b/src/generated/resources/assets/basemetals/items/obsidian_horse_armor.json new file mode 100644 index 000000000..4c35221d5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_ingot.json b/src/generated/resources/assets/basemetals/items/obsidian_ingot.json new file mode 100644 index 000000000..f24dddd69 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_leggings.json b/src/generated/resources/assets/basemetals/items/obsidian_leggings.json new file mode 100644 index 000000000..df429282d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_lever.json b/src/generated/resources/assets/basemetals/items/obsidian_lever.json new file mode 100644 index 000000000..789da2456 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_nugget.json b/src/generated/resources/assets/basemetals/items/obsidian_nugget.json new file mode 100644 index 000000000..3faea21a0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_pickaxe.json b/src/generated/resources/assets/basemetals/items/obsidian_pickaxe.json new file mode 100644 index 000000000..7202b76fe --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_powder.json b/src/generated/resources/assets/basemetals/items/obsidian_powder.json new file mode 100644 index 000000000..36fd0aa06 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_pressure_plate.json b/src/generated/resources/assets/basemetals/items/obsidian_pressure_plate.json new file mode 100644 index 000000000..a0c48344c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_rod.json b/src/generated/resources/assets/basemetals/items/obsidian_rod.json new file mode 100644 index 000000000..b91eddeb2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_scythe.json b/src/generated/resources/assets/basemetals/items/obsidian_scythe.json new file mode 100644 index 000000000..46134b026 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_shears.json b/src/generated/resources/assets/basemetals/items/obsidian_shears.json new file mode 100644 index 000000000..bca5aeee9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_shield.json b/src/generated/resources/assets/basemetals/items/obsidian_shield.json new file mode 100644 index 000000000..7ab03dcee --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_shovel.json b/src/generated/resources/assets/basemetals/items/obsidian_shovel.json new file mode 100644 index 000000000..e269ede9b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_slab.json b/src/generated/resources/assets/basemetals/items/obsidian_slab.json new file mode 100644 index 000000000..9cffa3126 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_smallpowder.json b/src/generated/resources/assets/basemetals/items/obsidian_smallpowder.json new file mode 100644 index 000000000..6fadef9a8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_stairs.json b/src/generated/resources/assets/basemetals/items/obsidian_stairs.json new file mode 100644 index 000000000..0c3a92499 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_sword.json b/src/generated/resources/assets/basemetals/items/obsidian_sword.json new file mode 100644 index 000000000..8725fc02d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_trapdoor.json b/src/generated/resources/assets/basemetals/items/obsidian_trapdoor.json new file mode 100644 index 000000000..7207aa254 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/obsidian_wall.json b/src/generated/resources/assets/basemetals/items/obsidian_wall.json new file mode 100644 index 000000000..dc75f8a3a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/obsidian_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/obsidian_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter.json b/src/generated/resources/assets/basemetals/items/pewter.json new file mode 100644 index 000000000..ef2393940 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_arrow.json b/src/generated/resources/assets/basemetals/items/pewter_arrow.json new file mode 100644 index 000000000..2d99ec90e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_axe.json b/src/generated/resources/assets/basemetals/items/pewter_axe.json new file mode 100644 index 000000000..e95f876e1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_bars.json b/src/generated/resources/assets/basemetals/items/pewter_bars.json new file mode 100644 index 000000000..263cf6a3e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_blend.json b/src/generated/resources/assets/basemetals/items/pewter_blend.json new file mode 100644 index 000000000..dc0cdb833 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_block.json b/src/generated/resources/assets/basemetals/items/pewter_block.json new file mode 100644 index 000000000..0bae8d13b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_bolt.json b/src/generated/resources/assets/basemetals/items/pewter_bolt.json new file mode 100644 index 000000000..5be1eeeba --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_boots.json b/src/generated/resources/assets/basemetals/items/pewter_boots.json new file mode 100644 index 000000000..e9b630c6b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_bow.json b/src/generated/resources/assets/basemetals/items/pewter_bow.json new file mode 100644 index 000000000..5dee2b253 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_bucket.json b/src/generated/resources/assets/basemetals/items/pewter_bucket.json new file mode 100644 index 000000000..19b1d4e51 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -7170401 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_button.json b/src/generated/resources/assets/basemetals/items/pewter_button.json new file mode 100644 index 000000000..3af46f637 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_chestplate.json b/src/generated/resources/assets/basemetals/items/pewter_chestplate.json new file mode 100644 index 000000000..5e61da33a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_crackhammer.json b/src/generated/resources/assets/basemetals/items/pewter_crackhammer.json new file mode 100644 index 000000000..1bab68847 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_crossbow.json b/src/generated/resources/assets/basemetals/items/pewter_crossbow.json new file mode 100644 index 000000000..740c787d0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_door.json b/src/generated/resources/assets/basemetals/items/pewter_door.json new file mode 100644 index 000000000..dcd51849d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_fishing_rod.json b/src/generated/resources/assets/basemetals/items/pewter_fishing_rod.json new file mode 100644 index 000000000..cf2ae5ea2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_gear.json b/src/generated/resources/assets/basemetals/items/pewter_gear.json new file mode 100644 index 000000000..26f726ae8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_helmet.json b/src/generated/resources/assets/basemetals/items/pewter_helmet.json new file mode 100644 index 000000000..e0cc23fb9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_hoe.json b/src/generated/resources/assets/basemetals/items/pewter_hoe.json new file mode 100644 index 000000000..50d3fc7f5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_horse_armor.json b/src/generated/resources/assets/basemetals/items/pewter_horse_armor.json new file mode 100644 index 000000000..1e7e9c081 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_ingot.json b/src/generated/resources/assets/basemetals/items/pewter_ingot.json new file mode 100644 index 000000000..dc104fe83 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_leggings.json b/src/generated/resources/assets/basemetals/items/pewter_leggings.json new file mode 100644 index 000000000..cdd9671af --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_lever.json b/src/generated/resources/assets/basemetals/items/pewter_lever.json new file mode 100644 index 000000000..0d0673578 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_nugget.json b/src/generated/resources/assets/basemetals/items/pewter_nugget.json new file mode 100644 index 000000000..d2344ed6e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_pickaxe.json b/src/generated/resources/assets/basemetals/items/pewter_pickaxe.json new file mode 100644 index 000000000..16f3da278 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_plate.json b/src/generated/resources/assets/basemetals/items/pewter_plate.json new file mode 100644 index 000000000..433870f96 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_powder.json b/src/generated/resources/assets/basemetals/items/pewter_powder.json new file mode 100644 index 000000000..3b236642a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_pressure_plate.json b/src/generated/resources/assets/basemetals/items/pewter_pressure_plate.json new file mode 100644 index 000000000..d43462809 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_rod.json b/src/generated/resources/assets/basemetals/items/pewter_rod.json new file mode 100644 index 000000000..57293f6ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_scythe.json b/src/generated/resources/assets/basemetals/items/pewter_scythe.json new file mode 100644 index 000000000..23affdca9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_shears.json b/src/generated/resources/assets/basemetals/items/pewter_shears.json new file mode 100644 index 000000000..98eb463bc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_shield.json b/src/generated/resources/assets/basemetals/items/pewter_shield.json new file mode 100644 index 000000000..2025a7068 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_shovel.json b/src/generated/resources/assets/basemetals/items/pewter_shovel.json new file mode 100644 index 000000000..85f632a58 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_slab.json b/src/generated/resources/assets/basemetals/items/pewter_slab.json new file mode 100644 index 000000000..2d169b740 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_smallblend.json b/src/generated/resources/assets/basemetals/items/pewter_smallblend.json new file mode 100644 index 000000000..fa472a941 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_smallpowder.json b/src/generated/resources/assets/basemetals/items/pewter_smallpowder.json new file mode 100644 index 000000000..f198de4e7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_stairs.json b/src/generated/resources/assets/basemetals/items/pewter_stairs.json new file mode 100644 index 000000000..bd106939e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_sword.json b/src/generated/resources/assets/basemetals/items/pewter_sword.json new file mode 100644 index 000000000..ea28f1bc8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_trapdoor.json b/src/generated/resources/assets/basemetals/items/pewter_trapdoor.json new file mode 100644 index 000000000..2020f444a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/pewter_wall.json b/src/generated/resources/assets/basemetals/items/pewter_wall.json new file mode 100644 index 000000000..b4bf66217 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/pewter_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/pewter_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum.json b/src/generated/resources/assets/basemetals/items/platinum.json new file mode 100644 index 000000000..9aa03fa49 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_arrow.json b/src/generated/resources/assets/basemetals/items/platinum_arrow.json new file mode 100644 index 000000000..fe787fe44 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_axe.json b/src/generated/resources/assets/basemetals/items/platinum_axe.json new file mode 100644 index 000000000..ada5f3163 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_bars.json b/src/generated/resources/assets/basemetals/items/platinum_bars.json new file mode 100644 index 000000000..7e59370b1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_block.json b/src/generated/resources/assets/basemetals/items/platinum_block.json new file mode 100644 index 000000000..04637d7e8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_bolt.json b/src/generated/resources/assets/basemetals/items/platinum_bolt.json new file mode 100644 index 000000000..7231daf92 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_boots.json b/src/generated/resources/assets/basemetals/items/platinum_boots.json new file mode 100644 index 000000000..b0574e9d8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_bow.json b/src/generated/resources/assets/basemetals/items/platinum_bow.json new file mode 100644 index 000000000..70bce5ae1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_bucket.json b/src/generated/resources/assets/basemetals/items/platinum_bucket.json new file mode 100644 index 000000000..0e0c38a19 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -851969 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_button.json b/src/generated/resources/assets/basemetals/items/platinum_button.json new file mode 100644 index 000000000..9c4e4ad69 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_casing.json b/src/generated/resources/assets/basemetals/items/platinum_casing.json new file mode 100644 index 000000000..0d4cb2ed1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_chestplate.json b/src/generated/resources/assets/basemetals/items/platinum_chestplate.json new file mode 100644 index 000000000..aa9b1a7b2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_clump.json b/src/generated/resources/assets/basemetals/items/platinum_clump.json new file mode 100644 index 000000000..a040c6aa8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_crackhammer.json b/src/generated/resources/assets/basemetals/items/platinum_crackhammer.json new file mode 100644 index 000000000..b02d653a5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_crossbow.json b/src/generated/resources/assets/basemetals/items/platinum_crossbow.json new file mode 100644 index 000000000..b3b8591e5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_crushed.json b/src/generated/resources/assets/basemetals/items/platinum_crushed.json new file mode 100644 index 000000000..29716ffee --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_crushed_purified.json b/src/generated/resources/assets/basemetals/items/platinum_crushed_purified.json new file mode 100644 index 000000000..c0e88e8de --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_crystal.json b/src/generated/resources/assets/basemetals/items/platinum_crystal.json new file mode 100644 index 000000000..fda2a6c5b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_dense_plate.json b/src/generated/resources/assets/basemetals/items/platinum_dense_plate.json new file mode 100644 index 000000000..3373cb65f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_door.json b/src/generated/resources/assets/basemetals/items/platinum_door.json new file mode 100644 index 000000000..75fbf0de7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_fishing_rod.json b/src/generated/resources/assets/basemetals/items/platinum_fishing_rod.json new file mode 100644 index 000000000..a557ed302 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_gear.json b/src/generated/resources/assets/basemetals/items/platinum_gear.json new file mode 100644 index 000000000..1f02aca99 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_helmet.json b/src/generated/resources/assets/basemetals/items/platinum_helmet.json new file mode 100644 index 000000000..24fdc99aa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_hoe.json b/src/generated/resources/assets/basemetals/items/platinum_hoe.json new file mode 100644 index 000000000..442e380ab --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_horse_armor.json b/src/generated/resources/assets/basemetals/items/platinum_horse_armor.json new file mode 100644 index 000000000..6ebef5329 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_ingot.json b/src/generated/resources/assets/basemetals/items/platinum_ingot.json new file mode 100644 index 000000000..a79f38585 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_leggings.json b/src/generated/resources/assets/basemetals/items/platinum_leggings.json new file mode 100644 index 000000000..2c10f537f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_lever.json b/src/generated/resources/assets/basemetals/items/platinum_lever.json new file mode 100644 index 000000000..fc6f4c8fb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_nugget.json b/src/generated/resources/assets/basemetals/items/platinum_nugget.json new file mode 100644 index 000000000..57a9c345e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_ore.json b/src/generated/resources/assets/basemetals/items/platinum_ore.json new file mode 100644 index 000000000..62288520d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_pickaxe.json b/src/generated/resources/assets/basemetals/items/platinum_pickaxe.json new file mode 100644 index 000000000..765137182 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_plate.json b/src/generated/resources/assets/basemetals/items/platinum_plate.json new file mode 100644 index 000000000..5a77746a2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_powder.json b/src/generated/resources/assets/basemetals/items/platinum_powder.json new file mode 100644 index 000000000..9597a228f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_powder_dirty.json b/src/generated/resources/assets/basemetals/items/platinum_powder_dirty.json new file mode 100644 index 000000000..27c6d4a36 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_pressure_plate.json b/src/generated/resources/assets/basemetals/items/platinum_pressure_plate.json new file mode 100644 index 000000000..c4ee5282e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_raw.json b/src/generated/resources/assets/basemetals/items/platinum_raw.json new file mode 100644 index 000000000..6700bc73c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_rod.json b/src/generated/resources/assets/basemetals/items/platinum_rod.json new file mode 100644 index 000000000..5847eb5d4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_scythe.json b/src/generated/resources/assets/basemetals/items/platinum_scythe.json new file mode 100644 index 000000000..9e353da14 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_shard.json b/src/generated/resources/assets/basemetals/items/platinum_shard.json new file mode 100644 index 000000000..a1c2b1f11 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_shears.json b/src/generated/resources/assets/basemetals/items/platinum_shears.json new file mode 100644 index 000000000..8df6be84b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_shield.json b/src/generated/resources/assets/basemetals/items/platinum_shield.json new file mode 100644 index 000000000..6731d175e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_shovel.json b/src/generated/resources/assets/basemetals/items/platinum_shovel.json new file mode 100644 index 000000000..1568097d5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_slab.json b/src/generated/resources/assets/basemetals/items/platinum_slab.json new file mode 100644 index 000000000..9bb53e2dc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_smallpowder.json b/src/generated/resources/assets/basemetals/items/platinum_smallpowder.json new file mode 100644 index 000000000..c0387141e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_stairs.json b/src/generated/resources/assets/basemetals/items/platinum_stairs.json new file mode 100644 index 000000000..9ce542367 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_sword.json b/src/generated/resources/assets/basemetals/items/platinum_sword.json new file mode 100644 index 000000000..2b075d84b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_trapdoor.json b/src/generated/resources/assets/basemetals/items/platinum_trapdoor.json new file mode 100644 index 000000000..1ede53681 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/platinum_wall.json b/src/generated/resources/assets/basemetals/items/platinum_wall.json new file mode 100644 index 000000000..b078fd6e8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/platinum_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/platinum_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/prismarine.json b/src/generated/resources/assets/basemetals/items/prismarine.json new file mode 100644 index 000000000..9b0483459 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/prismarine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/prismarine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/prismarine_bucket.json b/src/generated/resources/assets/basemetals/items/prismarine_bucket.json new file mode 100644 index 000000000..1f03190fa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/prismarine_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/prismarine_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz.json b/src/generated/resources/assets/basemetals/items/quartz.json new file mode 100644 index 000000000..12b106475 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_arrow.json b/src/generated/resources/assets/basemetals/items/quartz_arrow.json new file mode 100644 index 000000000..23885f40e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_axe.json b/src/generated/resources/assets/basemetals/items/quartz_axe.json new file mode 100644 index 000000000..c450b753f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_bars.json b/src/generated/resources/assets/basemetals/items/quartz_bars.json new file mode 100644 index 000000000..59146df62 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_bolt.json b/src/generated/resources/assets/basemetals/items/quartz_bolt.json new file mode 100644 index 000000000..e58eaa226 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_boots.json b/src/generated/resources/assets/basemetals/items/quartz_boots.json new file mode 100644 index 000000000..be8c59f8d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_bow.json b/src/generated/resources/assets/basemetals/items/quartz_bow.json new file mode 100644 index 000000000..1209d6434 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_bucket.json b/src/generated/resources/assets/basemetals/items/quartz_bucket.json new file mode 100644 index 000000000..9088d22e0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1383461 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_button.json b/src/generated/resources/assets/basemetals/items/quartz_button.json new file mode 100644 index 000000000..5f9f1d244 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_chestplate.json b/src/generated/resources/assets/basemetals/items/quartz_chestplate.json new file mode 100644 index 000000000..c826ddb91 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_crackhammer.json b/src/generated/resources/assets/basemetals/items/quartz_crackhammer.json new file mode 100644 index 000000000..0e218320d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_crossbow.json b/src/generated/resources/assets/basemetals/items/quartz_crossbow.json new file mode 100644 index 000000000..b3b6a0fae --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_door.json b/src/generated/resources/assets/basemetals/items/quartz_door.json new file mode 100644 index 000000000..b0f0f4e7e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_fishing_rod.json b/src/generated/resources/assets/basemetals/items/quartz_fishing_rod.json new file mode 100644 index 000000000..a14ea6f1c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_gear.json b/src/generated/resources/assets/basemetals/items/quartz_gear.json new file mode 100644 index 000000000..f8d249f77 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_helmet.json b/src/generated/resources/assets/basemetals/items/quartz_helmet.json new file mode 100644 index 000000000..3247d4718 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_hoe.json b/src/generated/resources/assets/basemetals/items/quartz_hoe.json new file mode 100644 index 000000000..df043f53d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_horse_armor.json b/src/generated/resources/assets/basemetals/items/quartz_horse_armor.json new file mode 100644 index 000000000..0dc0ba187 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_leggings.json b/src/generated/resources/assets/basemetals/items/quartz_leggings.json new file mode 100644 index 000000000..9c1c213f2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_lever.json b/src/generated/resources/assets/basemetals/items/quartz_lever.json new file mode 100644 index 000000000..0ca2bec41 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_nugget.json b/src/generated/resources/assets/basemetals/items/quartz_nugget.json new file mode 100644 index 000000000..9edc2de82 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_pickaxe.json b/src/generated/resources/assets/basemetals/items/quartz_pickaxe.json new file mode 100644 index 000000000..b42f76e7f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_powder.json b/src/generated/resources/assets/basemetals/items/quartz_powder.json new file mode 100644 index 000000000..3e1e69109 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_pressure_plate.json b/src/generated/resources/assets/basemetals/items/quartz_pressure_plate.json new file mode 100644 index 000000000..a3edfec6e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_rod.json b/src/generated/resources/assets/basemetals/items/quartz_rod.json new file mode 100644 index 000000000..dc52ff78d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_scythe.json b/src/generated/resources/assets/basemetals/items/quartz_scythe.json new file mode 100644 index 000000000..503b34943 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_shears.json b/src/generated/resources/assets/basemetals/items/quartz_shears.json new file mode 100644 index 000000000..1eca38b80 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_shield.json b/src/generated/resources/assets/basemetals/items/quartz_shield.json new file mode 100644 index 000000000..c3baf3d2d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_shovel.json b/src/generated/resources/assets/basemetals/items/quartz_shovel.json new file mode 100644 index 000000000..4821c97aa --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_smallpowder.json b/src/generated/resources/assets/basemetals/items/quartz_smallpowder.json new file mode 100644 index 000000000..d04665773 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_sword.json b/src/generated/resources/assets/basemetals/items/quartz_sword.json new file mode 100644 index 000000000..7f5d24855 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_trapdoor.json b/src/generated/resources/assets/basemetals/items/quartz_trapdoor.json new file mode 100644 index 000000000..47ec44a40 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/quartz_wall.json b/src/generated/resources/assets/basemetals/items/quartz_wall.json new file mode 100644 index 000000000..ce1e942ea --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/quartz_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/quartz_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/redstone.json b/src/generated/resources/assets/basemetals/items/redstone.json new file mode 100644 index 000000000..a55d0ac04 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/redstone.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/redstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/redstone_bucket.json b/src/generated/resources/assets/basemetals/items/redstone_bucket.json new file mode 100644 index 000000000..e9e1cfd21 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/redstone_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/redstone_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -9306112 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/redstone_ingot.json b/src/generated/resources/assets/basemetals/items/redstone_ingot.json new file mode 100644 index 000000000..e79bf4428 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/redstone_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/redstone_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/redstone_smallpowder.json b/src/generated/resources/assets/basemetals/items/redstone_smallpowder.json new file mode 100644 index 000000000..87e226e62 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/redstone_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/redstone_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver.json b/src/generated/resources/assets/basemetals/items/silver.json new file mode 100644 index 000000000..bd62085e2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_arrow.json b/src/generated/resources/assets/basemetals/items/silver_arrow.json new file mode 100644 index 000000000..7de04253d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_axe.json b/src/generated/resources/assets/basemetals/items/silver_axe.json new file mode 100644 index 000000000..2dce83a81 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_bars.json b/src/generated/resources/assets/basemetals/items/silver_bars.json new file mode 100644 index 000000000..be3e3bb0e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_block.json b/src/generated/resources/assets/basemetals/items/silver_block.json new file mode 100644 index 000000000..d4cb78422 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_bolt.json b/src/generated/resources/assets/basemetals/items/silver_bolt.json new file mode 100644 index 000000000..f063e5d93 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_boots.json b/src/generated/resources/assets/basemetals/items/silver_boots.json new file mode 100644 index 000000000..22b93e48a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_bow.json b/src/generated/resources/assets/basemetals/items/silver_bow.json new file mode 100644 index 000000000..8c1d5f008 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_bucket.json b/src/generated/resources/assets/basemetals/items/silver_bucket.json new file mode 100644 index 000000000..c20d1faa8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_button.json b/src/generated/resources/assets/basemetals/items/silver_button.json new file mode 100644 index 000000000..25b9b63db --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_chestplate.json b/src/generated/resources/assets/basemetals/items/silver_chestplate.json new file mode 100644 index 000000000..515e756dd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_crackhammer.json b/src/generated/resources/assets/basemetals/items/silver_crackhammer.json new file mode 100644 index 000000000..0f4678f93 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_crossbow.json b/src/generated/resources/assets/basemetals/items/silver_crossbow.json new file mode 100644 index 000000000..4dfb981f6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/silver_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/silver_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_door.json b/src/generated/resources/assets/basemetals/items/silver_door.json new file mode 100644 index 000000000..e1c6de6d6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_fishing_rod.json b/src/generated/resources/assets/basemetals/items/silver_fishing_rod.json new file mode 100644 index 000000000..4d2f76b14 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/silver_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/silver_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_gear.json b/src/generated/resources/assets/basemetals/items/silver_gear.json new file mode 100644 index 000000000..1837c2b4c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_helmet.json b/src/generated/resources/assets/basemetals/items/silver_helmet.json new file mode 100644 index 000000000..1836b7f90 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_hoe.json b/src/generated/resources/assets/basemetals/items/silver_hoe.json new file mode 100644 index 000000000..0c0fef7f4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_horse_armor.json b/src/generated/resources/assets/basemetals/items/silver_horse_armor.json new file mode 100644 index 000000000..8f3517bbc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_ingot.json b/src/generated/resources/assets/basemetals/items/silver_ingot.json new file mode 100644 index 000000000..cd187f80d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_leggings.json b/src/generated/resources/assets/basemetals/items/silver_leggings.json new file mode 100644 index 000000000..84e65d142 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_lever.json b/src/generated/resources/assets/basemetals/items/silver_lever.json new file mode 100644 index 000000000..265f3c069 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_nugget.json b/src/generated/resources/assets/basemetals/items/silver_nugget.json new file mode 100644 index 000000000..8d33b20d8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_ore.json b/src/generated/resources/assets/basemetals/items/silver_ore.json new file mode 100644 index 000000000..9d22e0509 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_pickaxe.json b/src/generated/resources/assets/basemetals/items/silver_pickaxe.json new file mode 100644 index 000000000..cc6d3c00d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_plate.json b/src/generated/resources/assets/basemetals/items/silver_plate.json new file mode 100644 index 000000000..ee73641ab --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_powder.json b/src/generated/resources/assets/basemetals/items/silver_powder.json new file mode 100644 index 000000000..ecd9d3090 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_pressure_plate.json b/src/generated/resources/assets/basemetals/items/silver_pressure_plate.json new file mode 100644 index 000000000..1265b542d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_raw.json b/src/generated/resources/assets/basemetals/items/silver_raw.json new file mode 100644 index 000000000..84afefdaf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_rod.json b/src/generated/resources/assets/basemetals/items/silver_rod.json new file mode 100644 index 000000000..80b11f2f1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_scythe.json b/src/generated/resources/assets/basemetals/items/silver_scythe.json new file mode 100644 index 000000000..0668a3ef7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_shears.json b/src/generated/resources/assets/basemetals/items/silver_shears.json new file mode 100644 index 000000000..0f8b9ec35 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_shield.json b/src/generated/resources/assets/basemetals/items/silver_shield.json new file mode 100644 index 000000000..5d76ccc0e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/silver_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/silver_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_shovel.json b/src/generated/resources/assets/basemetals/items/silver_shovel.json new file mode 100644 index 000000000..b4075a4b4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_slab.json b/src/generated/resources/assets/basemetals/items/silver_slab.json new file mode 100644 index 000000000..a90554c74 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_smallpowder.json b/src/generated/resources/assets/basemetals/items/silver_smallpowder.json new file mode 100644 index 000000000..37886270b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_stairs.json b/src/generated/resources/assets/basemetals/items/silver_stairs.json new file mode 100644 index 000000000..6053d6793 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_sword.json b/src/generated/resources/assets/basemetals/items/silver_sword.json new file mode 100644 index 000000000..abf38e34e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_trapdoor.json b/src/generated/resources/assets/basemetals/items/silver_trapdoor.json new file mode 100644 index 000000000..3cb0b99a4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/silver_wall.json b/src/generated/resources/assets/basemetals/items/silver_wall.json new file mode 100644 index 000000000..aec2b2581 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/silver_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/silver_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel.json b/src/generated/resources/assets/basemetals/items/starsteel.json new file mode 100644 index 000000000..844b9051d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_arrow.json b/src/generated/resources/assets/basemetals/items/starsteel_arrow.json new file mode 100644 index 000000000..3d907715a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_axe.json b/src/generated/resources/assets/basemetals/items/starsteel_axe.json new file mode 100644 index 000000000..8f98ee0a1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_bars.json b/src/generated/resources/assets/basemetals/items/starsteel_bars.json new file mode 100644 index 000000000..3620aab5a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_block.json b/src/generated/resources/assets/basemetals/items/starsteel_block.json new file mode 100644 index 000000000..ad3e0aeaf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_bolt.json b/src/generated/resources/assets/basemetals/items/starsteel_bolt.json new file mode 100644 index 000000000..522a862f8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_boots.json b/src/generated/resources/assets/basemetals/items/starsteel_boots.json new file mode 100644 index 000000000..cfd2f2da2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_bow.json b/src/generated/resources/assets/basemetals/items/starsteel_bow.json new file mode 100644 index 000000000..9ddf6284a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_bucket.json b/src/generated/resources/assets/basemetals/items/starsteel_bucket.json new file mode 100644 index 000000000..404c8f94c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -11323073 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_button.json b/src/generated/resources/assets/basemetals/items/starsteel_button.json new file mode 100644 index 000000000..c48c81330 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_casing.json b/src/generated/resources/assets/basemetals/items/starsteel_casing.json new file mode 100644 index 000000000..1d29a3c1c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_chestplate.json b/src/generated/resources/assets/basemetals/items/starsteel_chestplate.json new file mode 100644 index 000000000..940fafe3d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_clump.json b/src/generated/resources/assets/basemetals/items/starsteel_clump.json new file mode 100644 index 000000000..8e50cb9fe --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_crackhammer.json b/src/generated/resources/assets/basemetals/items/starsteel_crackhammer.json new file mode 100644 index 000000000..5617c49d8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_crossbow.json b/src/generated/resources/assets/basemetals/items/starsteel_crossbow.json new file mode 100644 index 000000000..9c631e50c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_crushed.json b/src/generated/resources/assets/basemetals/items/starsteel_crushed.json new file mode 100644 index 000000000..5775d3b3f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_crushed_purified.json b/src/generated/resources/assets/basemetals/items/starsteel_crushed_purified.json new file mode 100644 index 000000000..67f19525c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_crystal.json b/src/generated/resources/assets/basemetals/items/starsteel_crystal.json new file mode 100644 index 000000000..46c74bc4c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_dense_plate.json b/src/generated/resources/assets/basemetals/items/starsteel_dense_plate.json new file mode 100644 index 000000000..dc02b0157 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_door.json b/src/generated/resources/assets/basemetals/items/starsteel_door.json new file mode 100644 index 000000000..389044976 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_fishing_rod.json b/src/generated/resources/assets/basemetals/items/starsteel_fishing_rod.json new file mode 100644 index 000000000..3cc3cdd4f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_gear.json b/src/generated/resources/assets/basemetals/items/starsteel_gear.json new file mode 100644 index 000000000..9dcc80a17 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_helmet.json b/src/generated/resources/assets/basemetals/items/starsteel_helmet.json new file mode 100644 index 000000000..4a7276740 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_hoe.json b/src/generated/resources/assets/basemetals/items/starsteel_hoe.json new file mode 100644 index 000000000..1443749ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_horse_armor.json b/src/generated/resources/assets/basemetals/items/starsteel_horse_armor.json new file mode 100644 index 000000000..61f645f53 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_ingot.json b/src/generated/resources/assets/basemetals/items/starsteel_ingot.json new file mode 100644 index 000000000..2fbf14110 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_leggings.json b/src/generated/resources/assets/basemetals/items/starsteel_leggings.json new file mode 100644 index 000000000..1d466adce --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_lever.json b/src/generated/resources/assets/basemetals/items/starsteel_lever.json new file mode 100644 index 000000000..3e3ce9f2d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_nugget.json b/src/generated/resources/assets/basemetals/items/starsteel_nugget.json new file mode 100644 index 000000000..5c93fbad5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_ore.json b/src/generated/resources/assets/basemetals/items/starsteel_ore.json new file mode 100644 index 000000000..ab760896c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_pickaxe.json b/src/generated/resources/assets/basemetals/items/starsteel_pickaxe.json new file mode 100644 index 000000000..353e35c0f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_plate.json b/src/generated/resources/assets/basemetals/items/starsteel_plate.json new file mode 100644 index 000000000..93ed791d8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_powder.json b/src/generated/resources/assets/basemetals/items/starsteel_powder.json new file mode 100644 index 000000000..5402ca23a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_powder_dirty.json b/src/generated/resources/assets/basemetals/items/starsteel_powder_dirty.json new file mode 100644 index 000000000..128e1c871 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_pressure_plate.json b/src/generated/resources/assets/basemetals/items/starsteel_pressure_plate.json new file mode 100644 index 000000000..4be3a49f8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_raw.json b/src/generated/resources/assets/basemetals/items/starsteel_raw.json new file mode 100644 index 000000000..a355f3fde --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_rod.json b/src/generated/resources/assets/basemetals/items/starsteel_rod.json new file mode 100644 index 000000000..a63640123 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_scythe.json b/src/generated/resources/assets/basemetals/items/starsteel_scythe.json new file mode 100644 index 000000000..88d35b30c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_shard.json b/src/generated/resources/assets/basemetals/items/starsteel_shard.json new file mode 100644 index 000000000..61f2daeb6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_shears.json b/src/generated/resources/assets/basemetals/items/starsteel_shears.json new file mode 100644 index 000000000..fa81c790a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_shield.json b/src/generated/resources/assets/basemetals/items/starsteel_shield.json new file mode 100644 index 000000000..5a2e81652 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_shovel.json b/src/generated/resources/assets/basemetals/items/starsteel_shovel.json new file mode 100644 index 000000000..08fdbef15 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_slab.json b/src/generated/resources/assets/basemetals/items/starsteel_slab.json new file mode 100644 index 000000000..82cb33e27 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_smallpowder.json b/src/generated/resources/assets/basemetals/items/starsteel_smallpowder.json new file mode 100644 index 000000000..1b0a90b16 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_stairs.json b/src/generated/resources/assets/basemetals/items/starsteel_stairs.json new file mode 100644 index 000000000..152fb132a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_sword.json b/src/generated/resources/assets/basemetals/items/starsteel_sword.json new file mode 100644 index 000000000..f660a4152 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_trapdoor.json b/src/generated/resources/assets/basemetals/items/starsteel_trapdoor.json new file mode 100644 index 000000000..9d95d5d40 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/starsteel_wall.json b/src/generated/resources/assets/basemetals/items/starsteel_wall.json new file mode 100644 index 000000000..6ec63ae32 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/starsteel_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/starsteel_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel.json b/src/generated/resources/assets/basemetals/items/steel.json new file mode 100644 index 000000000..8d791eb52 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_anvil.json b/src/generated/resources/assets/basemetals/items/steel_anvil.json new file mode 100644 index 000000000..257713699 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_anvil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_anvil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_arrow.json b/src/generated/resources/assets/basemetals/items/steel_arrow.json new file mode 100644 index 000000000..69ef25d66 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_axe.json b/src/generated/resources/assets/basemetals/items/steel_axe.json new file mode 100644 index 000000000..5e411d551 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_bars.json b/src/generated/resources/assets/basemetals/items/steel_bars.json new file mode 100644 index 000000000..7c9261659 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_blend.json b/src/generated/resources/assets/basemetals/items/steel_blend.json new file mode 100644 index 000000000..a7b330f2c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_blend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_blend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_block.json b/src/generated/resources/assets/basemetals/items/steel_block.json new file mode 100644 index 000000000..07fb2acd6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_bolt.json b/src/generated/resources/assets/basemetals/items/steel_bolt.json new file mode 100644 index 000000000..28d63a5ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_boots.json b/src/generated/resources/assets/basemetals/items/steel_boots.json new file mode 100644 index 000000000..c47e18158 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_bow.json b/src/generated/resources/assets/basemetals/items/steel_bow.json new file mode 100644 index 000000000..0d1e369b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_bucket.json b/src/generated/resources/assets/basemetals/items/steel_bucket.json new file mode 100644 index 000000000..fb37bee57 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -2759707 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_button.json b/src/generated/resources/assets/basemetals/items/steel_button.json new file mode 100644 index 000000000..1e8446807 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_chestplate.json b/src/generated/resources/assets/basemetals/items/steel_chestplate.json new file mode 100644 index 000000000..30fde4c56 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_crackhammer.json b/src/generated/resources/assets/basemetals/items/steel_crackhammer.json new file mode 100644 index 000000000..ce4589713 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_crossbow.json b/src/generated/resources/assets/basemetals/items/steel_crossbow.json new file mode 100644 index 000000000..b761fbdbd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/steel_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/steel_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_door.json b/src/generated/resources/assets/basemetals/items/steel_door.json new file mode 100644 index 000000000..a5c0602e0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_fishing_rod.json b/src/generated/resources/assets/basemetals/items/steel_fishing_rod.json new file mode 100644 index 000000000..dab250748 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/steel_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/steel_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_gear.json b/src/generated/resources/assets/basemetals/items/steel_gear.json new file mode 100644 index 000000000..0f2f3efff --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_helmet.json b/src/generated/resources/assets/basemetals/items/steel_helmet.json new file mode 100644 index 000000000..dd37f5d8a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_hoe.json b/src/generated/resources/assets/basemetals/items/steel_hoe.json new file mode 100644 index 000000000..a867401c6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_horse_armor.json b/src/generated/resources/assets/basemetals/items/steel_horse_armor.json new file mode 100644 index 000000000..b0a5992c6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_ingot.json b/src/generated/resources/assets/basemetals/items/steel_ingot.json new file mode 100644 index 000000000..1ad411bea --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_leggings.json b/src/generated/resources/assets/basemetals/items/steel_leggings.json new file mode 100644 index 000000000..2ed7602fe --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_lever.json b/src/generated/resources/assets/basemetals/items/steel_lever.json new file mode 100644 index 000000000..c66377c0b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_nugget.json b/src/generated/resources/assets/basemetals/items/steel_nugget.json new file mode 100644 index 000000000..36f8a7cd6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_pickaxe.json b/src/generated/resources/assets/basemetals/items/steel_pickaxe.json new file mode 100644 index 000000000..2f07dd550 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_plate.json b/src/generated/resources/assets/basemetals/items/steel_plate.json new file mode 100644 index 000000000..8aa762553 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_powder.json b/src/generated/resources/assets/basemetals/items/steel_powder.json new file mode 100644 index 000000000..ed183869c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_pressure_plate.json b/src/generated/resources/assets/basemetals/items/steel_pressure_plate.json new file mode 100644 index 000000000..7be2183ae --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_rod.json b/src/generated/resources/assets/basemetals/items/steel_rod.json new file mode 100644 index 000000000..f894cab41 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_scythe.json b/src/generated/resources/assets/basemetals/items/steel_scythe.json new file mode 100644 index 000000000..b0086777f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_shears.json b/src/generated/resources/assets/basemetals/items/steel_shears.json new file mode 100644 index 000000000..95e0d2c89 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_shield.json b/src/generated/resources/assets/basemetals/items/steel_shield.json new file mode 100644 index 000000000..344a2a7cf --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/steel_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/steel_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_shovel.json b/src/generated/resources/assets/basemetals/items/steel_shovel.json new file mode 100644 index 000000000..93b11c8a7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_slab.json b/src/generated/resources/assets/basemetals/items/steel_slab.json new file mode 100644 index 000000000..2fdc7eea2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_smallblend.json b/src/generated/resources/assets/basemetals/items/steel_smallblend.json new file mode 100644 index 000000000..b0ba6eee9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_smallblend.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_smallblend" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_smallpowder.json b/src/generated/resources/assets/basemetals/items/steel_smallpowder.json new file mode 100644 index 000000000..7110d12e5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_stairs.json b/src/generated/resources/assets/basemetals/items/steel_stairs.json new file mode 100644 index 000000000..78536be47 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_sword.json b/src/generated/resources/assets/basemetals/items/steel_sword.json new file mode 100644 index 000000000..d95caa81f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_trapdoor.json b/src/generated/resources/assets/basemetals/items/steel_trapdoor.json new file mode 100644 index 000000000..3f1bfdf0f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/steel_wall.json b/src/generated/resources/assets/basemetals/items/steel_wall.json new file mode 100644 index 000000000..57929dde3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/steel_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/steel_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone.json b/src/generated/resources/assets/basemetals/items/stone.json new file mode 100644 index 000000000..25d408549 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone_anvil.json b/src/generated/resources/assets/basemetals/items/stone_anvil.json new file mode 100644 index 000000000..7f9f58229 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone_anvil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone_anvil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone_bucket.json b/src/generated/resources/assets/basemetals/items/stone_bucket.json new file mode 100644 index 000000000..1c643611c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -7368817 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone_crackhammer.json b/src/generated/resources/assets/basemetals/items/stone_crackhammer.json new file mode 100644 index 000000000..44afe2eee --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone_gear.json b/src/generated/resources/assets/basemetals/items/stone_gear.json new file mode 100644 index 000000000..b7824c288 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone_rod.json b/src/generated/resources/assets/basemetals/items/stone_rod.json new file mode 100644 index 000000000..5d2a82e52 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/stone_scythe.json b/src/generated/resources/assets/basemetals/items/stone_scythe.json new file mode 100644 index 000000000..6191f3708 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/stone_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/stone_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin.json b/src/generated/resources/assets/basemetals/items/tin.json new file mode 100644 index 000000000..ebcc741e6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_arrow.json b/src/generated/resources/assets/basemetals/items/tin_arrow.json new file mode 100644 index 000000000..03d6472ca --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_axe.json b/src/generated/resources/assets/basemetals/items/tin_axe.json new file mode 100644 index 000000000..3830ab825 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_bars.json b/src/generated/resources/assets/basemetals/items/tin_bars.json new file mode 100644 index 000000000..5813c2312 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_block.json b/src/generated/resources/assets/basemetals/items/tin_block.json new file mode 100644 index 000000000..a55c7ef41 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_bolt.json b/src/generated/resources/assets/basemetals/items/tin_bolt.json new file mode 100644 index 000000000..6ef5e00cc --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_boots.json b/src/generated/resources/assets/basemetals/items/tin_boots.json new file mode 100644 index 000000000..66b31f00e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_bow.json b/src/generated/resources/assets/basemetals/items/tin_bow.json new file mode 100644 index 000000000..257147f57 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_bucket.json b/src/generated/resources/assets/basemetals/items/tin_bucket.json new file mode 100644 index 000000000..2c33b1415 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -2066 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_button.json b/src/generated/resources/assets/basemetals/items/tin_button.json new file mode 100644 index 000000000..e835ff81d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_chestplate.json b/src/generated/resources/assets/basemetals/items/tin_chestplate.json new file mode 100644 index 000000000..2acfcffda --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_crackhammer.json b/src/generated/resources/assets/basemetals/items/tin_crackhammer.json new file mode 100644 index 000000000..2e4b988af --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_crossbow.json b/src/generated/resources/assets/basemetals/items/tin_crossbow.json new file mode 100644 index 000000000..5302e6ffb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/tin_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/tin_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_door.json b/src/generated/resources/assets/basemetals/items/tin_door.json new file mode 100644 index 000000000..175690881 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_fishing_rod.json b/src/generated/resources/assets/basemetals/items/tin_fishing_rod.json new file mode 100644 index 000000000..99ae36112 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/tin_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/tin_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_gear.json b/src/generated/resources/assets/basemetals/items/tin_gear.json new file mode 100644 index 000000000..4d8d5ab06 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_helmet.json b/src/generated/resources/assets/basemetals/items/tin_helmet.json new file mode 100644 index 000000000..749753fd3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_hoe.json b/src/generated/resources/assets/basemetals/items/tin_hoe.json new file mode 100644 index 000000000..fdd9b144d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_horse_armor.json b/src/generated/resources/assets/basemetals/items/tin_horse_armor.json new file mode 100644 index 000000000..5a2e8f679 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_ingot.json b/src/generated/resources/assets/basemetals/items/tin_ingot.json new file mode 100644 index 000000000..b0ca53ad4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_leggings.json b/src/generated/resources/assets/basemetals/items/tin_leggings.json new file mode 100644 index 000000000..0a92d9abd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_lever.json b/src/generated/resources/assets/basemetals/items/tin_lever.json new file mode 100644 index 000000000..f5a8771a9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_nugget.json b/src/generated/resources/assets/basemetals/items/tin_nugget.json new file mode 100644 index 000000000..24c5b1d99 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_ore.json b/src/generated/resources/assets/basemetals/items/tin_ore.json new file mode 100644 index 000000000..2214edc85 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_pickaxe.json b/src/generated/resources/assets/basemetals/items/tin_pickaxe.json new file mode 100644 index 000000000..8595441c7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_plate.json b/src/generated/resources/assets/basemetals/items/tin_plate.json new file mode 100644 index 000000000..9a8c034ad --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_powder.json b/src/generated/resources/assets/basemetals/items/tin_powder.json new file mode 100644 index 000000000..b3646bf30 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_pressure_plate.json b/src/generated/resources/assets/basemetals/items/tin_pressure_plate.json new file mode 100644 index 000000000..037775435 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_raw.json b/src/generated/resources/assets/basemetals/items/tin_raw.json new file mode 100644 index 000000000..bcd3463b0 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_rod.json b/src/generated/resources/assets/basemetals/items/tin_rod.json new file mode 100644 index 000000000..9a8652f01 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_scythe.json b/src/generated/resources/assets/basemetals/items/tin_scythe.json new file mode 100644 index 000000000..9606a5f15 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_shears.json b/src/generated/resources/assets/basemetals/items/tin_shears.json new file mode 100644 index 000000000..15ae8b731 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_shield.json b/src/generated/resources/assets/basemetals/items/tin_shield.json new file mode 100644 index 000000000..229a63b3e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/tin_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/tin_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_shovel.json b/src/generated/resources/assets/basemetals/items/tin_shovel.json new file mode 100644 index 000000000..56c60bc81 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_slab.json b/src/generated/resources/assets/basemetals/items/tin_slab.json new file mode 100644 index 000000000..c18d4a5ac --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_smallpowder.json b/src/generated/resources/assets/basemetals/items/tin_smallpowder.json new file mode 100644 index 000000000..d9aa8060e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_stairs.json b/src/generated/resources/assets/basemetals/items/tin_stairs.json new file mode 100644 index 000000000..a04fcb121 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_sword.json b/src/generated/resources/assets/basemetals/items/tin_sword.json new file mode 100644 index 000000000..dee808ea4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_trapdoor.json b/src/generated/resources/assets/basemetals/items/tin_trapdoor.json new file mode 100644 index 000000000..14483bf35 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/tin_wall.json b/src/generated/resources/assets/basemetals/items/tin_wall.json new file mode 100644 index 000000000..bacb7f07b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/tin_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/tin_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/wood.json b/src/generated/resources/assets/basemetals/items/wood.json new file mode 100644 index 000000000..fc236e81c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/wood.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/wood" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/wood_bucket.json b/src/generated/resources/assets/basemetals/items/wood_bucket.json new file mode 100644 index 000000000..c45840a2a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/wood_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/wood_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -9874381 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/wood_crackhammer.json b/src/generated/resources/assets/basemetals/items/wood_crackhammer.json new file mode 100644 index 000000000..86e1c361a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/wood_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/wood_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/wood_gear.json b/src/generated/resources/assets/basemetals/items/wood_gear.json new file mode 100644 index 000000000..edfd4459e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/wood_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/wood_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/wood_scythe.json b/src/generated/resources/assets/basemetals/items/wood_scythe.json new file mode 100644 index 000000000..ade96aca5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/wood_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/wood_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc.json b/src/generated/resources/assets/basemetals/items/zinc.json new file mode 100644 index 000000000..b69d9f9f7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_arrow.json b/src/generated/resources/assets/basemetals/items/zinc_arrow.json new file mode 100644 index 000000000..dc9933e6c --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_arrow" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_axe.json b/src/generated/resources/assets/basemetals/items/zinc_axe.json new file mode 100644 index 000000000..d860ba994 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_bars.json b/src/generated/resources/assets/basemetals/items/zinc_bars.json new file mode 100644 index 000000000..4d8a7b391 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_bars.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_block.json b/src/generated/resources/assets/basemetals/items/zinc_block.json new file mode 100644 index 000000000..1f41889eb --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_bolt.json b/src/generated/resources/assets/basemetals/items/zinc_bolt.json new file mode 100644 index 000000000..8b1b2f2b3 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_boots.json b/src/generated/resources/assets/basemetals/items/zinc_boots.json new file mode 100644 index 000000000..e0dde59d5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_bow.json b/src/generated/resources/assets/basemetals/items/zinc_bow.json new file mode 100644 index 000000000..008327d1d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_bucket.json b/src/generated/resources/assets/basemetals/items/zinc_bucket.json new file mode 100644 index 000000000..4c0e1b53f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_bucket", + "tints": [ + { + "type": "minecraft:constant", + "value": -1 + }, + { + "type": "minecraft:constant", + "value": -4408132 + }, + { + "type": "minecraft:constant", + "value": -1 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_button.json b/src/generated/resources/assets/basemetals/items/zinc_button.json new file mode 100644 index 000000000..9b94ae3a7 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_button" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_casing.json b/src/generated/resources/assets/basemetals/items/zinc_casing.json new file mode 100644 index 000000000..4a56ddc38 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_chestplate.json b/src/generated/resources/assets/basemetals/items/zinc_chestplate.json new file mode 100644 index 000000000..ff8d611b5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_clump.json b/src/generated/resources/assets/basemetals/items/zinc_clump.json new file mode 100644 index 000000000..fe751cf89 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_clump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_clump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_crackhammer.json b/src/generated/resources/assets/basemetals/items/zinc_crackhammer.json new file mode 100644 index 000000000..15224388e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_crackhammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crackhammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_crossbow.json b/src/generated/resources/assets/basemetals/items/zinc_crossbow.json new file mode 100644 index 000000000..6f4daae06 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_crossbow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crossbow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crossbow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crossbow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crossbow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_crushed.json b/src/generated/resources/assets/basemetals/items/zinc_crushed.json new file mode 100644 index 000000000..e97fb2a12 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_crushed.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crushed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_crushed_purified.json b/src/generated/resources/assets/basemetals/items/zinc_crushed_purified.json new file mode 100644 index 000000000..9229b2e6a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_crushed_purified.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crushed_purified" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_crystal.json b/src/generated/resources/assets/basemetals/items/zinc_crystal.json new file mode 100644 index 000000000..a17d6e303 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_crystal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_dense_plate.json b/src/generated/resources/assets/basemetals/items/zinc_dense_plate.json new file mode 100644 index 000000000..744630825 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_dense_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_dense_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_door.json b/src/generated/resources/assets/basemetals/items/zinc_door.json new file mode 100644 index 000000000..fa8aba490 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_fishing_rod.json b/src/generated/resources/assets/basemetals/items/zinc_fishing_rod.json new file mode 100644 index 000000000..9c26a1ef8 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_fishing_rod" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_fishing_rod_cast" + }, + "property": "minecraft:fishing_rod/cast" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_gear.json b/src/generated/resources/assets/basemetals/items/zinc_gear.json new file mode 100644 index 000000000..4ba2c5b27 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_helmet.json b/src/generated/resources/assets/basemetals/items/zinc_helmet.json new file mode 100644 index 000000000..bbb369461 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_hoe.json b/src/generated/resources/assets/basemetals/items/zinc_hoe.json new file mode 100644 index 000000000..cbcdb43f2 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_horse_armor.json b/src/generated/resources/assets/basemetals/items/zinc_horse_armor.json new file mode 100644 index 000000000..bdedcb810 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_horse_armor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_ingot.json b/src/generated/resources/assets/basemetals/items/zinc_ingot.json new file mode 100644 index 000000000..3ffa035a5 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_leggings.json b/src/generated/resources/assets/basemetals/items/zinc_leggings.json new file mode 100644 index 000000000..84d7dd6fd --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_lever.json b/src/generated/resources/assets/basemetals/items/zinc_lever.json new file mode 100644 index 000000000..fa8ceac00 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_lever.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_lever" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_nugget.json b/src/generated/resources/assets/basemetals/items/zinc_nugget.json new file mode 100644 index 000000000..a258edc2f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_ore.json b/src/generated/resources/assets/basemetals/items/zinc_ore.json new file mode 100644 index 000000000..7a31a0899 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_pickaxe.json b/src/generated/resources/assets/basemetals/items/zinc_pickaxe.json new file mode 100644 index 000000000..501e6909d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_plate.json b/src/generated/resources/assets/basemetals/items/zinc_plate.json new file mode 100644 index 000000000..97d74edb4 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_powder.json b/src/generated/resources/assets/basemetals/items/zinc_powder.json new file mode 100644 index 000000000..276f0bd4a --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_powder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_powder_dirty.json b/src/generated/resources/assets/basemetals/items/zinc_powder_dirty.json new file mode 100644 index 000000000..eceeb8663 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_powder_dirty.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_powder_dirty" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_pressure_plate.json b/src/generated/resources/assets/basemetals/items/zinc_pressure_plate.json new file mode 100644 index 000000000..a2024df8e --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_pressure_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_raw.json b/src/generated/resources/assets/basemetals/items/zinc_raw.json new file mode 100644 index 000000000..d4990c1b6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_raw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_raw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_rod.json b/src/generated/resources/assets/basemetals/items/zinc_rod.json new file mode 100644 index 000000000..6c9e3d220 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_scythe.json b/src/generated/resources/assets/basemetals/items/zinc_scythe.json new file mode 100644 index 000000000..1c4d432a1 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_scythe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_scythe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_shard.json b/src/generated/resources/assets/basemetals/items/zinc_shard.json new file mode 100644 index 000000000..9292aa4ee --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_shard" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_shears.json b/src/generated/resources/assets/basemetals/items/zinc_shears.json new file mode 100644 index 000000000..4c5f05492 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_shears.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_shears" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_shield.json b/src/generated/resources/assets/basemetals/items/zinc_shield.json new file mode 100644 index 000000000..a5f505c0f --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_shield.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_shield" + }, + "on_true": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_shield_blocking" + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_shovel.json b/src/generated/resources/assets/basemetals/items/zinc_shovel.json new file mode 100644 index 000000000..e75bcbf1b --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_slab.json b/src/generated/resources/assets/basemetals/items/zinc_slab.json new file mode 100644 index 000000000..e8cc3e875 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_smallpowder.json b/src/generated/resources/assets/basemetals/items/zinc_smallpowder.json new file mode 100644 index 000000000..de8fd3974 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_smallpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_smallpowder" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_stairs.json b/src/generated/resources/assets/basemetals/items/zinc_stairs.json new file mode 100644 index 000000000..8a9648d2d --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_sword.json b/src/generated/resources/assets/basemetals/items/zinc_sword.json new file mode 100644 index 000000000..e7f160b58 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_trapdoor.json b/src/generated/resources/assets/basemetals/items/zinc_trapdoor.json new file mode 100644 index 000000000..9be3502e6 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/items/zinc_wall.json b/src/generated/resources/assets/basemetals/items/zinc_wall.json new file mode 100644 index 000000000..b089d5ea9 --- /dev/null +++ b/src/generated/resources/assets/basemetals/items/zinc_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "basemetals:item/zinc_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json b/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json index cf478f6b9..38938b06f 100644 --- a/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/adamantine_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/antimony_ore.json b/src/generated/resources/assets/basemetals/models/block/antimony_ore.json index 2f6c539cf..455751585 100644 --- a/src/generated/resources/assets/basemetals/models/block/antimony_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/antimony_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json b/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json index 04093bf87..a87766ff3 100644 --- a/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/bismuth_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json b/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json index 7c71a454f..b56f8029a 100644 --- a/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/coldiron_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/copper_ore.json b/src/generated/resources/assets/basemetals/models/block/copper_ore.json index 204bf5576..362a244c4 100644 --- a/src/generated/resources/assets/basemetals/models/block/copper_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/copper_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/lead_ore.json b/src/generated/resources/assets/basemetals/models/block/lead_ore.json index 2c9af0d61..2ab4c2fd3 100644 --- a/src/generated/resources/assets/basemetals/models/block/lead_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/lead_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/mercury_ore.json b/src/generated/resources/assets/basemetals/models/block/mercury_ore.json index c06f2cf61..b47f3936b 100644 --- a/src/generated/resources/assets/basemetals/models/block/mercury_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/mercury_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/nickel_ore.json b/src/generated/resources/assets/basemetals/models/block/nickel_ore.json index c7ee32be6..ac67f042f 100644 --- a/src/generated/resources/assets/basemetals/models/block/nickel_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/nickel_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/platinum_ore.json b/src/generated/resources/assets/basemetals/models/block/platinum_ore.json index 41a1a2710..5518797ba 100644 --- a/src/generated/resources/assets/basemetals/models/block/platinum_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/platinum_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/silver_ore.json b/src/generated/resources/assets/basemetals/models/block/silver_ore.json index b50402132..58f56a520 100644 --- a/src/generated/resources/assets/basemetals/models/block/silver_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/silver_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json b/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json index f6c6aa897..e01d9c6ac 100644 --- a/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/starsteel_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/tin_ore.json b/src/generated/resources/assets/basemetals/models/block/tin_ore.json index 5944634dc..28ec4ab66 100644 --- a/src/generated/resources/assets/basemetals/models/block/tin_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/tin_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/block/zinc_ore.json b/src/generated/resources/assets/basemetals/models/block/zinc_ore.json index d45399311..92d25d448 100644 --- a/src/generated/resources/assets/basemetals/models/block/zinc_ore.json +++ b/src/generated/resources/assets/basemetals/models/block/zinc_ore.json @@ -29,14 +29,14 @@ } }, "from": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "to": [ - 16, - 16, - 16 + 16.0, + 16.0, + 16.0 ] }, { diff --git a/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json b/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json index b5e4b2da6..6189fbf5b 100644 --- a/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/adamantine_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:adamantine", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json b/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json index 0e05e23b0..9c801169f 100644 --- a/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/antimony_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:antimony", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json b/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json index 437ff7c05..f0f8958a3 100644 --- a/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/aquarium_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:aquarium", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json b/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json index 80db8c69e..faf44cfec 100644 --- a/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/bismuth_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:bismuth", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/brass_bucket.json b/src/generated/resources/assets/basemetals/models/item/brass_bucket.json index c0742c26b..c1edc4f57 100644 --- a/src/generated/resources/assets/basemetals/models/item/brass_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/brass_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:brass", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json b/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json index 7874aef4c..2fbbf5531 100644 --- a/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/bronze_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:bronze", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json b/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json index 6367c584c..02f22ecfc 100644 --- a/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/charcoal_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:charcoal", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/coal_bucket.json b/src/generated/resources/assets/basemetals/models/item/coal_bucket.json index 6c5c5b407..b63543af1 100644 --- a/src/generated/resources/assets/basemetals/models/item/coal_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/coal_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:coal", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json b/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json index 78dd99cf0..a085cf78e 100644 --- a/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/coldiron_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:coldiron", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/copper_bucket.json b/src/generated/resources/assets/basemetals/models/item/copper_bucket.json index af43d9764..cee2b5830 100644 --- a/src/generated/resources/assets/basemetals/models/item/copper_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/copper_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:copper", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json b/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json index 35a2f458d..64d0e29e8 100644 --- a/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/cupronickel_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:cupronickel", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json b/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json index 9dfdd2df6..e42b1c8c1 100644 --- a/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/diamond_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:diamond", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json b/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json index 23a635be3..10f68ae65 100644 --- a/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/electrum_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:electrum", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json b/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json index 7aa174d57..4819f55d0 100644 --- a/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/emerald_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:emerald", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/ender_bucket.json b/src/generated/resources/assets/basemetals/models/item/ender_bucket.json index c6a9dce6e..98b071e5c 100644 --- a/src/generated/resources/assets/basemetals/models/item/ender_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/ender_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:ender", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/gold_bucket.json b/src/generated/resources/assets/basemetals/models/item/gold_bucket.json index 7b6c03e02..fdfd6b11c 100644 --- a/src/generated/resources/assets/basemetals/models/item/gold_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/gold_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:gold", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/invar_bucket.json b/src/generated/resources/assets/basemetals/models/item/invar_bucket.json index 284faa04a..01ef40419 100644 --- a/src/generated/resources/assets/basemetals/models/item/invar_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/invar_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:invar", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/iron_bucket.json b/src/generated/resources/assets/basemetals/models/item/iron_bucket.json index 83bce0c5b..20b4bbaed 100644 --- a/src/generated/resources/assets/basemetals/models/item/iron_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/iron_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:iron", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json b/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json index 993d7702f..d5b7c1e66 100644 --- a/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/lapis_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:lapis", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/lead_bucket.json b/src/generated/resources/assets/basemetals/models/item/lead_bucket.json index 64751626e..d9b0dafc2 100644 --- a/src/generated/resources/assets/basemetals/models/item/lead_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/lead_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:lead", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json b/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json index 66edc1f81..c3ff8e3be 100644 --- a/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/mercury_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:mercury", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json b/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json index f8edd6ef6..b55870164 100644 --- a/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/mithril_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:mithril", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json b/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json index 302ff9669..93e334d14 100644 --- a/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/nickel_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:nickel", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json b/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json index 2649bdecf..3ce26c804 100644 --- a/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/obsidian_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:obsidian", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json b/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json index 74f89ca49..988591909 100644 --- a/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/pewter_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:pewter", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json b/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json index 05abb94c2..274339b5b 100644 --- a/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/platinum_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:platinum", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json b/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json index 4e3834ea3..f966edbb3 100644 --- a/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/prismarine_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:prismarine", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json b/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json index 14f2bee3e..0748a6cef 100644 --- a/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/quartz_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:quartz", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json b/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json index 2a3a82510..322699fc2 100644 --- a/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/redstone_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:redstone", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/silver_bucket.json b/src/generated/resources/assets/basemetals/models/item/silver_bucket.json index 4545b091e..cc80031fb 100644 --- a/src/generated/resources/assets/basemetals/models/item/silver_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/silver_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:silver", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json b/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json index 8e507995a..bf8e559fd 100644 --- a/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/starsteel_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:starsteel", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/steel_bucket.json b/src/generated/resources/assets/basemetals/models/item/steel_bucket.json index 9cb9720e9..034678326 100644 --- a/src/generated/resources/assets/basemetals/models/item/steel_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/steel_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:steel", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/stone_bucket.json b/src/generated/resources/assets/basemetals/models/item/stone_bucket.json index b84f66231..81ed6d08d 100644 --- a/src/generated/resources/assets/basemetals/models/item/stone_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/stone_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:stone", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/tin_bucket.json b/src/generated/resources/assets/basemetals/models/item/tin_bucket.json index 0b1588db2..b700e66a7 100644 --- a/src/generated/resources/assets/basemetals/models/item/tin_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/tin_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:tin", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/wood_bucket.json b/src/generated/resources/assets/basemetals/models/item/wood_bucket.json index a4dbff0a8..b67b08a9a 100644 --- a/src/generated/resources/assets/basemetals/models/item/wood_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/wood_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:wood", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json b/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json index a74301dff..3034062b4 100644 --- a/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json +++ b/src/generated/resources/assets/basemetals/models/item/zinc_bucket.json @@ -1,5 +1,11 @@ { "parent": "forge:item/bucket", "fluid": "basemetals:zinc", - "loader": "forge:fluid_container" + "loader": "forge:fluid_container", + "textures": { + "base": "basemetals:block/bucket_base", + "cover": "basemetals:block/bucket_cover", + "fluid": "basemetals:block/bucket_fluid", + "particle": "#base" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/adamantine.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/adamantine.png new file mode 100644 index 000000000..a43c0cec4 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/adamantine.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/antimony.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/antimony.png new file mode 100644 index 000000000..39290812a Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/antimony.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/aquarium.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/aquarium.png new file mode 100644 index 000000000..4d104ada6 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/aquarium.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/bismuth.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/bismuth.png new file mode 100644 index 000000000..9856e9be4 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/bismuth.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/brass.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/brass.png new file mode 100644 index 000000000..02276865d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/brass.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/bronze.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/bronze.png new file mode 100644 index 000000000..da264696d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/bronze.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/coldiron.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/coldiron.png new file mode 100644 index 000000000..af20b99b5 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/coldiron.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/copper.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/copper.png new file mode 100644 index 000000000..417a9892c Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/copper.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/cupronickel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/cupronickel.png new file mode 100644 index 000000000..00edf126d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/cupronickel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/electrum.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/electrum.png new file mode 100644 index 000000000..741cafe42 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/electrum.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/emerald.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/emerald.png new file mode 100644 index 000000000..7185f4aed Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/emerald.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/invar.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/invar.png new file mode 100644 index 000000000..8f5d58c97 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/invar.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/lead.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/lead.png new file mode 100644 index 000000000..59f1eae9e Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/lead.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/mithril.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/mithril.png new file mode 100644 index 000000000..fe5ccf749 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/mithril.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/nickel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/nickel.png new file mode 100644 index 000000000..2c3b9460b Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/nickel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/obsidian.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/obsidian.png new file mode 100644 index 000000000..3fa17d730 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/obsidian.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/pewter.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/pewter.png new file mode 100644 index 000000000..e96faa7ec Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/pewter.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/platinum.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/platinum.png new file mode 100644 index 000000000..36e02d153 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/platinum.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/quartz.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/quartz.png new file mode 100644 index 000000000..55457b62b Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/quartz.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/silver.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/silver.png new file mode 100644 index 000000000..9b1fb6d62 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/silver.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/starsteel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/starsteel.png new file mode 100644 index 000000000..fa6caaf19 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/starsteel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/steel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/steel.png new file mode 100644 index 000000000..392087dd6 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/steel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/tin.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/tin.png new file mode 100644 index 000000000..d40a5cf71 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/tin.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/zinc.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/zinc.png new file mode 100644 index 000000000..28c911413 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/horse_body/zinc.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/adamantine.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/adamantine.png new file mode 100644 index 000000000..fcb26291b Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/adamantine.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/antimony.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/antimony.png new file mode 100644 index 000000000..dae0f4e70 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/antimony.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/aquarium.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/aquarium.png new file mode 100644 index 000000000..96138604e Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/aquarium.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/bismuth.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/bismuth.png new file mode 100644 index 000000000..b5c862b5f Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/bismuth.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/brass.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/brass.png new file mode 100644 index 000000000..1688458e6 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/brass.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/bronze.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/bronze.png new file mode 100644 index 000000000..a269ac5f8 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/bronze.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/coldiron.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/coldiron.png new file mode 100644 index 000000000..16b9d4718 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/coldiron.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/copper.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/copper.png new file mode 100644 index 000000000..b6cf488e5 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/copper.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/cupronickel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/cupronickel.png new file mode 100644 index 000000000..b079406ea Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/cupronickel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/electrum.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/electrum.png new file mode 100644 index 000000000..e67c12ef4 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/electrum.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/emerald.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/emerald.png new file mode 100644 index 000000000..d94b96da6 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/emerald.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/invar.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/invar.png new file mode 100644 index 000000000..69c8f71f8 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/invar.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/lead.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/lead.png new file mode 100644 index 000000000..d45ca9b06 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/lead.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/mithril.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/mithril.png new file mode 100644 index 000000000..71b631127 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/mithril.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/nickel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/nickel.png new file mode 100644 index 000000000..58e1d4eab Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/nickel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/obsidian.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/obsidian.png new file mode 100644 index 000000000..73e3051a9 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/obsidian.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/pewter.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/pewter.png new file mode 100644 index 000000000..619e4b713 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/pewter.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/platinum.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/platinum.png new file mode 100644 index 000000000..ab3c693bf Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/platinum.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/quartz.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/quartz.png new file mode 100644 index 000000000..053a3d35d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/quartz.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/silver.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/silver.png new file mode 100644 index 000000000..307a1afeb Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/silver.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/starsteel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/starsteel.png new file mode 100644 index 000000000..11363479e Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/starsteel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/steel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/steel.png new file mode 100644 index 000000000..5c43304e8 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/steel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/tin.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/tin.png new file mode 100644 index 000000000..b40b911a9 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/tin.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/zinc.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/zinc.png new file mode 100644 index 000000000..ff32d1fbf Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid/zinc.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/adamantine.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/adamantine.png new file mode 100644 index 000000000..55c32f08e Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/adamantine.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/antimony.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/antimony.png new file mode 100644 index 000000000..a8597ace7 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/antimony.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/aquarium.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/aquarium.png new file mode 100644 index 000000000..1ca2b2d00 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/aquarium.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/bismuth.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/bismuth.png new file mode 100644 index 000000000..2afa77c9e Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/bismuth.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/brass.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/brass.png new file mode 100644 index 000000000..376c3c407 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/brass.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/bronze.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/bronze.png new file mode 100644 index 000000000..d3b44abae Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/bronze.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/coldiron.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/coldiron.png new file mode 100644 index 000000000..152c25ba5 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/coldiron.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/copper.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/copper.png new file mode 100644 index 000000000..a5b1ebf0d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/copper.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/cupronickel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/cupronickel.png new file mode 100644 index 000000000..b2c1965f5 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/cupronickel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/electrum.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/electrum.png new file mode 100644 index 000000000..11ef2f6c0 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/electrum.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/emerald.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/emerald.png new file mode 100644 index 000000000..6d6277bf3 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/emerald.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/invar.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/invar.png new file mode 100644 index 000000000..a9b9d7cfd Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/invar.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/lead.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/lead.png new file mode 100644 index 000000000..4ba8ac8a6 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/lead.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/mithril.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/mithril.png new file mode 100644 index 000000000..1e456bad4 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/mithril.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/nickel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/nickel.png new file mode 100644 index 000000000..beeb1134d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/nickel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/obsidian.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/obsidian.png new file mode 100644 index 000000000..4f7eb44e3 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/obsidian.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/pewter.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/pewter.png new file mode 100644 index 000000000..2473c9fec Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/pewter.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/platinum.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/platinum.png new file mode 100644 index 000000000..c55a37e0e Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/platinum.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/quartz.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/quartz.png new file mode 100644 index 000000000..8ca0b4c01 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/quartz.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/silver.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/silver.png new file mode 100644 index 000000000..77255f7b6 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/silver.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/starsteel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/starsteel.png new file mode 100644 index 000000000..44a9eb0ab Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/starsteel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/steel.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/steel.png new file mode 100644 index 000000000..6701bd121 Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/steel.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/tin.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/tin.png new file mode 100644 index 000000000..d2e8bfedc Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/tin.png differ diff --git a/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/zinc.png b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/zinc.png new file mode 100644 index 000000000..8d15f145d Binary files /dev/null and b/src/generated/resources/assets/basemetals/textures/entity/equipment/humanoid_leggings/zinc.png differ diff --git a/src/generated/resources/data/basemetals/advancement/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancement/recipes/copper_ingot_from_nuggets.json index 247b2001a..bf0c91a6f 100644 --- a/src/generated/resources/data/basemetals/advancement/recipes/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancement/recipes/copper_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "basemetals:copper_nugget" - ] + "items": "#forge:nuggets/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json index 55c23631f..14800559f 100644 --- a/src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/abandoned_mineshaft.json @@ -220,47 +220,47 @@ }, { "type": "minecraft:item", - "name": "basemetals:copper_axe", + "name": "minecraft:copper_axe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_boots", + "name": "minecraft:copper_boots", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_chestplate", + "name": "minecraft:copper_chestplate", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_helmet", + "name": "minecraft:copper_helmet", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_hoe", + "name": "minecraft:copper_hoe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_leggings", + "name": "minecraft:copper_leggings", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_pickaxe", + "name": "minecraft:copper_pickaxe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_shovel", + "name": "minecraft:copper_shovel", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_sword", + "name": "minecraft:copper_sword", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_table/chests/inject/spawn_bonus_chest.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/spawn_bonus_chest.json index 2eb8505b6..a7995dc8d 100644 --- a/src/generated/resources/data/basemetals/loot_table/chests/inject/spawn_bonus_chest.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/spawn_bonus_chest.json @@ -105,47 +105,47 @@ }, { "type": "minecraft:item", - "name": "basemetals:copper_axe", + "name": "minecraft:copper_axe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_boots", + "name": "minecraft:copper_boots", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_chestplate", + "name": "minecraft:copper_chestplate", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_helmet", + "name": "minecraft:copper_helmet", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_hoe", + "name": "minecraft:copper_hoe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_leggings", + "name": "minecraft:copper_leggings", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_pickaxe", + "name": "minecraft:copper_pickaxe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_shovel", + "name": "minecraft:copper_shovel", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_sword", + "name": "minecraft:copper_sword", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_crossing.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_crossing.json index 65a8fabfe..39dab5324 100644 --- a/src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_crossing.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/stronghold_crossing.json @@ -109,47 +109,47 @@ }, { "type": "minecraft:item", - "name": "basemetals:copper_axe", + "name": "minecraft:copper_axe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_boots", + "name": "minecraft:copper_boots", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_chestplate", + "name": "minecraft:copper_chestplate", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_helmet", + "name": "minecraft:copper_helmet", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_hoe", + "name": "minecraft:copper_hoe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_leggings", + "name": "minecraft:copper_leggings", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_pickaxe", + "name": "minecraft:copper_pickaxe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_shovel", + "name": "minecraft:copper_shovel", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_sword", + "name": "minecraft:copper_sword", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json index 2d667ad23..9e2ee6ec1 100644 --- a/src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_armorer.json @@ -109,47 +109,47 @@ }, { "type": "minecraft:item", - "name": "basemetals:copper_axe", + "name": "minecraft:copper_axe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_boots", + "name": "minecraft:copper_boots", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_chestplate", + "name": "minecraft:copper_chestplate", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_helmet", + "name": "minecraft:copper_helmet", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_hoe", + "name": "minecraft:copper_hoe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_leggings", + "name": "minecraft:copper_leggings", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_pickaxe", + "name": "minecraft:copper_pickaxe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_shovel", + "name": "minecraft:copper_shovel", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_sword", + "name": "minecraft:copper_sword", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json index 2d667ad23..9e2ee6ec1 100644 --- a/src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_toolsmith.json @@ -109,47 +109,47 @@ }, { "type": "minecraft:item", - "name": "basemetals:copper_axe", + "name": "minecraft:copper_axe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_boots", + "name": "minecraft:copper_boots", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_chestplate", + "name": "minecraft:copper_chestplate", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_helmet", + "name": "minecraft:copper_helmet", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_hoe", + "name": "minecraft:copper_hoe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_leggings", + "name": "minecraft:copper_leggings", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_pickaxe", + "name": "minecraft:copper_pickaxe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_shovel", + "name": "minecraft:copper_shovel", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_sword", + "name": "minecraft:copper_sword", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json index 2d667ad23..9e2ee6ec1 100644 --- a/src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json +++ b/src/generated/resources/data/basemetals/loot_table/chests/inject/village_weaponsmith.json @@ -109,47 +109,47 @@ }, { "type": "minecraft:item", - "name": "basemetals:copper_axe", + "name": "minecraft:copper_axe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_boots", + "name": "minecraft:copper_boots", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_chestplate", + "name": "minecraft:copper_chestplate", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_helmet", + "name": "minecraft:copper_helmet", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_hoe", + "name": "minecraft:copper_hoe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_leggings", + "name": "minecraft:copper_leggings", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_pickaxe", + "name": "minecraft:copper_pickaxe", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_shovel", + "name": "minecraft:copper_shovel", "weight": 3 }, { "type": "minecraft:item", - "name": "basemetals:copper_sword", + "name": "minecraft:copper_sword", "weight": 3 }, { diff --git a/src/generated/resources/data/basemetals/recipe/activator_rail.json b/src/generated/resources/data/basemetals/recipe/activator_rail.json index 633c62d6b..c764380f4 100644 --- a/src/generated/resources/data/basemetals/recipe/activator_rail.json +++ b/src/generated/resources/data/basemetals/recipe/activator_rail.json @@ -5,15 +5,9 @@ "category": "building", "group": "minecraft:activator_rail", "key": { - "R": { - "item": "minecraft:redstone_torch" - }, - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "R": "minecraft:redstone_torch", + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "XSX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_anvil.json b/src/generated/resources/data/basemetals/recipe/adamantine_anvil.json index 10cf9a50e..8bf0dda7f 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_anvil.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_anvil.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:adamantine_anvil", "key": { - "B": { - "tag": "forge:storage_blocks/adamantine" - }, - "I": { - "tag": "forge:ingots/adamantine" - } + "B": "#forge:storage_blocks/adamantine", + "I": "#forge:ingots/adamantine" }, "pattern": [ "BBB", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_arrow.json b/src/generated/resources/data/basemetals/recipe/adamantine_arrow.json index 28e9163da..cfdb98102 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:adamantine_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/adamantine" - }, - "R": { - "tag": "forge:rods/adamantine" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/adamantine", + "R": "#forge:rods/adamantine" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_arrow_recycling.json index e5b488e94..34de5b09c 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:adamantine_arrow" - }, + "ingredient": "basemetals:adamantine_arrow", "result": { "id": "basemetals:adamantine_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_axe.json b/src/generated/resources/data/basemetals/recipe/adamantine_axe.json index 6707928e8..344be4b48 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_axe.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/adamantine" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_axe_recycling.json index 20b9bde00..7c50bd14a 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_axe" - }, + "ingredient": "basemetals:adamantine_axe", "result": { "count": 3, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bars.json b/src/generated/resources/data/basemetals/recipe/adamantine_bars.json index a117df474..90985133f 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bars.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_bars", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bars_2.json b/src/generated/resources/data/basemetals/recipe/adamantine_bars_2.json index 20d1327f0..e0789322b 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_bars", "key": { - "X": { - "tag": "forge:rods/adamantine" - } + "X": "#forge:rods/adamantine" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_bars_recycling.json index 4814d9feb..f927f6c5a 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:adamantine_bars" - }, + "ingredient": "basemetals:adamantine_bars", "result": { "count": 3, "id": "basemetals:adamantine_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_block.json b/src/generated/resources/data/basemetals/recipe/adamantine_block.json index eeb11e419..6069ea503 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_block.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_block", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json index e00026ff3..129ebf1e9 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/adamantine" - }, + "ingredient": "#forge:storage_blocks/adamantine", "result": { "count": 9, "id": "basemetals:adamantine_powder" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/recipe/adamantine_block_ingot.json index ac05d9691..14ae15d27 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:adamantine_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/adamantine" - } + "#forge:storage_blocks/adamantine" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bolt.json b/src/generated/resources/data/basemetals/recipe/adamantine_bolt.json index c599b1dca..1aa6503d7 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/adamantine" - } + "F": "minecraft:feather", + "R": "#forge:rods/adamantine" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_bolt_recycling.json index 84e259890..13d434c0e 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:adamantine_bolt" - }, + "ingredient": "basemetals:adamantine_bolt", "result": { "count": 2, "id": "basemetals:adamantine_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_boots.json b/src/generated/resources/data/basemetals/recipe/adamantine_boots.json index 978ab5aa6..9a9b8f8fb 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_boots.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:adamantine_boots", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_boots_plate_repair.json index e98cdca26..13cd52595 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/adamantine" - }, + "plate": "#forge:plates/adamantine", "target": "basemetals:adamantine_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_boots_recycling.json index 9e398a48b..02cd136cc 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_boots" - }, + "ingredient": "basemetals:adamantine_boots", "result": { "count": 4, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bow.json b/src/generated/resources/data/basemetals/recipe/adamantine_bow.json index 26eebed94..bc73937c8 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bow.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_bow", "key": { - "R": { - "tag": "forge:rods/adamantine" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/adamantine", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_bow_recycling.json index 43b3d13f7..b8bf2a1ef 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_bow" - }, + "ingredient": "basemetals:adamantine_bow", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_button.json b/src/generated/resources/data/basemetals/recipe/adamantine_button.json index da4e13c12..2627e1356 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_button.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_button", "key": { - "X": { - "tag": "forge:nuggets/adamantine" - } + "X": "#forge:nuggets/adamantine" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_button_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_button_recycling.json index cd8b80655..54e30ee74 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:adamantine_button" - }, + "ingredient": "basemetals:adamantine_button", "result": { "count": 2, "id": "basemetals:adamantine_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_chestplate.json b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate.json index 2f99b5614..293c1a193 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:adamantine_chestplate", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_plate_repair.json index 7a93dfd3e..0bef57881 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/adamantine" - }, + "plate": "#forge:plates/adamantine", "target": "basemetals:adamantine_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_recycling.json index acbd147c0..d66fedb8f 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_chestplate" - }, + "ingredient": "basemetals:adamantine_chestplate", "result": { "count": 8, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer.json index fc7a4e67d..fb22640c6 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/adamantine" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer_recycling.json index 1dd837804..16d5d4b4b 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:adamantine_crackhammer" - }, + "ingredient": "basemetals:adamantine_crackhammer", "result": { "id": "basemetals:adamantine_block" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_crossbow.json b/src/generated/resources/data/basemetals/recipe/adamantine_crossbow.json index f7d337120..1d9f5a1bd 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:adamantine_crossbow", "key": { - "G": { - "tag": "forge:gears/adamantine" - }, - "R": { - "tag": "forge:rods/adamantine" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/adamantine", + "R": "#forge:rods/adamantine", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_crossbow_recycling.json index e067a9fa2..58fa04127 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_crossbow" - }, + "ingredient": "basemetals:adamantine_crossbow", "result": { "count": 4, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_door.json b/src/generated/resources/data/basemetals/recipe/adamantine_door.json index 01bc54fed..42e75cc8e 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_door.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_door", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_door_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_door_recycling.json index 4dbb4c4f7..85924b41a 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_door" - }, + "ingredient": "basemetals:adamantine_door", "result": { "count": 2, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/recipe/adamantine_fishingrod.json index cf66fba59..5c3360c7f 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_fishing_rod", "key": { - "R": { - "tag": "forge:rods/adamantine" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/adamantine", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_gear.json b/src/generated/resources/data/basemetals/recipe/adamantine_gear.json index 6305f194f..8d3405946 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_gear.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:adamantine_gear", "key": { - "R": { - "tag": "forge:rods/adamantine" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "R": "#forge:rods/adamantine", + "X": "#forge:ingots/adamantine" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_gear_recycling.json index 8634a5d4c..6ea532947 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_gear" - }, + "ingredient": "basemetals:adamantine_gear", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_helmet.json b/src/generated/resources/data/basemetals/recipe/adamantine_helmet.json index 3d47232c1..1162aafc0 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:adamantine_helmet", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_helmet_plate_repair.json index 03d427d40..d4d27e8d3 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/adamantine" - }, + "plate": "#forge:plates/adamantine", "target": "basemetals:adamantine_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_helmet_recycling.json index 47b6ed58a..1774fd911 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_helmet" - }, + "ingredient": "basemetals:adamantine_helmet", "result": { "count": 5, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_hoe.json b/src/generated/resources/data/basemetals/recipe/adamantine_hoe.json index 6ade2c22a..f97a7126d 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/adamantine" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_hoe_recycling.json index 2e23da2aa..6e26e7924 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_hoe" - }, + "ingredient": "basemetals:adamantine_hoe", "result": { "count": 2, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/recipe/adamantine_horsearmor.json index 271b1a7cd..df9cc17c5 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/adamantine" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json index 9346728d0..f4bf92e97 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/adamantine" - }, + "ingredient": "#forge:ingots/adamantine", "result": { "id": "basemetals:adamantine_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_from_nuggets.json index 9045a8ccc..13d4547cc 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:adamantine_ingot", "key": { - "X": { - "tag": "forge:nuggets/adamantine" - } + "X": "#forge:nuggets/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_leggings.json b/src/generated/resources/data/basemetals/recipe/adamantine_leggings.json index 0098620e6..7a4a1845a 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:adamantine_leggings", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_leggings_plate_repair.json index 1a6a92aba..877f47b51 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/adamantine" - }, + "plate": "#forge:plates/adamantine", "target": "basemetals:adamantine_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_leggings_recycling.json index 3fed48785..e4201ab2c 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_leggings" - }, + "ingredient": "basemetals:adamantine_leggings", "result": { "count": 7, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_lever.json b/src/generated/resources/data/basemetals/recipe/adamantine_lever.json index 52c47a6d1..d9054216f 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_lever.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:adamantine_lever", "key": { - "R": { - "tag": "forge:rods/adamantine" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "R": "#forge:rods/adamantine", + "X": "#forge:ingots/adamantine" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_lever_recycling.json index ddd91f658..b780156e8 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_lever" - }, + "ingredient": "basemetals:adamantine_lever", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json index 0d90d7b04..24adeef33 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/adamantine" - }, + "ingredient": "#forge:nuggets/adamantine", "result": { "id": "basemetals:adamantine_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_nuggets.json b/src/generated/resources/data/basemetals/recipe/adamantine_nuggets.json index f08c0cf26..01067fc44 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:adamantine_nugget", "ingredients": [ - { - "tag": "forge:ingots/adamantine" - } + "#forge:ingots/adamantine" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_blasting.json index e9c11db09..f9bd28995 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/adamantine" - }, + "ingredient": "#forge:ores/adamantine", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json index d003f70b3..279553103 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/adamantine" - }, + "ingredient": "#forge:ores/adamantine", "result": { "count": 2, "id": "basemetals:adamantine_powder" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_ore_smelting.json index 59aa367db..ab702a6be 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/adamantine" - }, + "ingredient": "#forge:ores/adamantine", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe.json index 3f7429e7d..ae611c4b9 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe_recycling.json index b67d2b937..a86c056f7 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_pickaxe" - }, + "ingredient": "basemetals:adamantine_pickaxe", "result": { "count": 3, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_plate.json b/src/generated/resources/data/basemetals/recipe/adamantine_plate.json index 8e635140a..3815adbb6 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_plate.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_plate", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_plate_recycling.json index ecbd8e67d..37c0fcfac 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_plate" - }, + "ingredient": "basemetals:adamantine_plate", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/adamantine_powder_from_small.json index c014fd25f..44f5dfc82 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:adamantine_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/adamantine" - } + "X": "#forge:tiny_dusts/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_powder_smelting.json index 109ec692e..165d85adc 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/adamantine" - }, + "ingredient": "#forge:dusts/adamantine", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate.json index b6c0aff82..1dbf6e588 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate_recycling.json index 2eced003b..fcb92c4ea 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_pressure_plate" - }, + "ingredient": "basemetals:adamantine_pressure_plate", "result": { "count": 2, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_blasting.json index b475cc632..d25bf00fd 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/adamantine" - }, + "ingredient": "#forge:raw_materials/adamantine", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json index 01fbd905d..422eece31 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/adamantine" - }, + "ingredient": "#forge:raw_materials/adamantine", "result": { "id": "basemetals:adamantine_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_raw_smelting.json index 8dbb30797..e353b914c 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/adamantine" - }, + "ingredient": "#forge:raw_materials/adamantine", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_rod.json b/src/generated/resources/data/basemetals/recipe/adamantine_rod.json index 181d967de..436256870 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_rod.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:adamantine_rod", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_rod_recycling.json index ed7efc053..830158534 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:adamantine_rod" - }, + "ingredient": "basemetals:adamantine_rod", "result": { "count": 4, "id": "basemetals:adamantine_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_scythe.json b/src/generated/resources/data/basemetals/recipe/adamantine_scythe.json index c54a773e9..cbad7815f 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/adamantine" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_shears.json b/src/generated/resources/data/basemetals/recipe/adamantine_shears.json index 38eeb1e86..2e1d54b42 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_shears.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:adamantine_shears", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_shears_recycling.json index 075036509..6070d3c9b 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_shears" - }, + "ingredient": "basemetals:adamantine_shears", "result": { "count": 2, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_shield.json b/src/generated/resources/data/basemetals/recipe/adamantine_shield.json index d5d3f965b..92e396389 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_shield.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/adamantine" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/adamantine_shield_plate_repair.json index 5fd8fc1ec..517afd034 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/adamantine" - }, + "plate": "#forge:plates/adamantine", "target": "basemetals:adamantine_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_shovel.json b/src/generated/resources/data/basemetals/recipe/adamantine_shovel.json index dc843b681..2547b1461 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/adamantine" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_shovel_recycling.json index 5d7d0b166..a3b6bf0a2 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_shovel" - }, + "ingredient": "basemetals:adamantine_shovel", "result": { "id": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_slab.json b/src/generated/resources/data/basemetals/recipe/adamantine_slab.json index 4c400e4a8..2173519e0 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_slab.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_slab", "key": { - "X": { - "tag": "forge:storage_blocks/adamantine" - } + "X": "#forge:storage_blocks/adamantine" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_slab_recycling.json index 8c253dbfc..5441e6ae9 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:adamantine_slab" - }, + "ingredient": "basemetals:adamantine_slab", "result": { "count": 4, "id": "basemetals:adamantine_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder.json index f0db907f3..10419990b 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:adamantine_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/adamantine" - } + "#forge:dusts/adamantine" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder_smelting.json index 60fb0b30d..88a18007a 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/adamantine" - }, + "ingredient": "#forge:tiny_dusts/adamantine", "result": { "id": "basemetals:adamantine_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_stairs.json b/src/generated/resources/data/basemetals/recipe/adamantine_stairs.json index 1559a2da4..79cbb4ba6 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/adamantine" - } + "X": "#forge:storage_blocks/adamantine" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_sword.json b/src/generated/resources/data/basemetals/recipe/adamantine_sword.json index 8c970cf21..db45e4076 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_sword.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:adamantine_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/adamantine" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/adamantine" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_sword_recycling.json index 399725d71..8aafd4d59 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_sword" - }, + "ingredient": "basemetals:adamantine_sword", "result": { "count": 2, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor.json index 03b9aa8ff..f3c8268a7 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_trapdoor", "key": { - "X": { - "tag": "forge:ingots/adamantine" - } + "X": "#forge:ingots/adamantine" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor_recycling.json index 95ac4a3b7..9f2d5ac13 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:adamantine_trapdoor" - }, + "ingredient": "basemetals:adamantine_trapdoor", "result": { "count": 4, "id": "basemetals:adamantine_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_wall.json b/src/generated/resources/data/basemetals/recipe/adamantine_wall.json index e0c58fd5f..9da951941 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_wall.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:adamantine_wall", "key": { - "X": { - "tag": "forge:storage_blocks/adamantine" - } + "X": "#forge:storage_blocks/adamantine" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/adamantine_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/adamantine_wall_recycling.json index 9aa5d54da..bcf75b16d 100644 --- a/src/generated/resources/data/basemetals/recipe/adamantine_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/adamantine_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:adamantine_wall" - }, + "ingredient": "basemetals:adamantine_wall", "result": { "id": "basemetals:adamantine_block" } diff --git a/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json b/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json index 3bf8930d4..eee9f23c5 100644 --- a/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/ancient_debris_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/netherite_scrap" - }, + "ingredient": "#forge:ores/netherite_scrap", "result": { "count": 2, "id": "minecraft:netherite_scrap" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_arrow.json b/src/generated/resources/data/basemetals/recipe/antimony_arrow.json index 3e549ee9c..877c0293c 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:antimony_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/antimony" - }, - "R": { - "tag": "forge:rods/antimony" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/antimony", + "R": "#forge:rods/antimony" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_arrow_recycling.json index 46afd480f..2cee961af 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:antimony_arrow" - }, + "ingredient": "basemetals:antimony_arrow", "result": { "id": "basemetals:antimony_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_axe.json b/src/generated/resources/data/basemetals/recipe/antimony_axe.json index 0c602a06e..7e06af207 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_axe.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/antimony" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_axe_recycling.json index cd60b00a4..5a2fbf44c 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_axe" - }, + "ingredient": "basemetals:antimony_axe", "result": { "count": 3, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bars.json b/src/generated/resources/data/basemetals/recipe/antimony_bars.json index 37daf480b..4c0254172 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bars.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_bars", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bars_2.json b/src/generated/resources/data/basemetals/recipe/antimony_bars_2.json index 5f2d9944d..5663b1379 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_bars", "key": { - "X": { - "tag": "forge:rods/antimony" - } + "X": "#forge:rods/antimony" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_bars_recycling.json index d0311425f..c9804ad81 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:antimony_bars" - }, + "ingredient": "basemetals:antimony_bars", "result": { "count": 3, "id": "basemetals:antimony_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_block.json b/src/generated/resources/data/basemetals/recipe/antimony_block.json index c1c254598..70a0dd8f2 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_block.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_block", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json index 344ccf29c..305fe68be 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/antimony" - }, + "ingredient": "#forge:storage_blocks/antimony", "result": { "count": 9, "id": "basemetals:antimony_powder" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_block_ingot.json b/src/generated/resources/data/basemetals/recipe/antimony_block_ingot.json index ec3ecf72f..3e4b64b63 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:antimony_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/antimony" - } + "#forge:storage_blocks/antimony" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bolt.json b/src/generated/resources/data/basemetals/recipe/antimony_bolt.json index 78e7bdc01..56bdbd8ce 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/antimony" - } + "F": "minecraft:feather", + "R": "#forge:rods/antimony" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_bolt_recycling.json index 781e9248c..857fc5cc5 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:antimony_bolt" - }, + "ingredient": "basemetals:antimony_bolt", "result": { "count": 2, "id": "basemetals:antimony_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_boots.json b/src/generated/resources/data/basemetals/recipe/antimony_boots.json index 27cdcf01e..64cba6aac 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_boots.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:antimony_boots", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_boots_plate_repair.json index ee7871df0..338249b18 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/antimony" - }, + "plate": "#forge:plates/antimony", "target": "basemetals:antimony_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_boots_recycling.json index f0c9cfa08..6f3570845 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_boots" - }, + "ingredient": "basemetals:antimony_boots", "result": { "count": 4, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bow.json b/src/generated/resources/data/basemetals/recipe/antimony_bow.json index 355507e0f..40c4fd3c8 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bow.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_bow", "key": { - "R": { - "tag": "forge:rods/antimony" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/antimony", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_bow_recycling.json index 9d922d121..ef1787725 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_bow" - }, + "ingredient": "basemetals:antimony_bow", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_button.json b/src/generated/resources/data/basemetals/recipe/antimony_button.json index 6f060d8af..2075e75fd 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_button.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_button", "key": { - "X": { - "tag": "forge:nuggets/antimony" - } + "X": "#forge:nuggets/antimony" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_button_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_button_recycling.json index 2167189a7..e479b3c54 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:antimony_button" - }, + "ingredient": "basemetals:antimony_button", "result": { "count": 2, "id": "basemetals:antimony_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_chestplate.json b/src/generated/resources/data/basemetals/recipe/antimony_chestplate.json index 8deb1f196..e82a2c3ac 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:antimony_chestplate", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_chestplate_plate_repair.json index e0bbf8201..27a22afb1 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/antimony" - }, + "plate": "#forge:plates/antimony", "target": "basemetals:antimony_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_chestplate_recycling.json index c1c82cab3..6dbb2e9cf 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_chestplate" - }, + "ingredient": "basemetals:antimony_chestplate", "result": { "count": 8, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_crackhammer.json b/src/generated/resources/data/basemetals/recipe/antimony_crackhammer.json index 62649df12..2faa0d4ab 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/antimony" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_crackhammer_recycling.json index d066a547c..5db36e6fc 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:antimony_crackhammer" - }, + "ingredient": "basemetals:antimony_crackhammer", "result": { "id": "basemetals:antimony_block" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_crossbow.json b/src/generated/resources/data/basemetals/recipe/antimony_crossbow.json index a9a358465..939efd4e7 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:antimony_crossbow", "key": { - "G": { - "tag": "forge:gears/antimony" - }, - "R": { - "tag": "forge:rods/antimony" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/antimony", + "R": "#forge:rods/antimony", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_crossbow_recycling.json index 79c51f85b..6112b4b8d 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_crossbow" - }, + "ingredient": "basemetals:antimony_crossbow", "result": { "count": 4, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_door.json b/src/generated/resources/data/basemetals/recipe/antimony_door.json index 9b312293f..fab33db5b 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_door.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_door", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_door_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_door_recycling.json index 8e72fbf16..2f7540f2b 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_door" - }, + "ingredient": "basemetals:antimony_door", "result": { "count": 2, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_fishingrod.json b/src/generated/resources/data/basemetals/recipe/antimony_fishingrod.json index 2a1512c9c..eb836f0e5 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_fishing_rod", "key": { - "R": { - "tag": "forge:rods/antimony" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/antimony", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_gear.json b/src/generated/resources/data/basemetals/recipe/antimony_gear.json index 9433b4dea..93447c99a 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_gear.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:antimony_gear", "key": { - "R": { - "tag": "forge:rods/antimony" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "R": "#forge:rods/antimony", + "X": "#forge:ingots/antimony" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_gear_recycling.json index 576c57215..b99b80eba 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_gear" - }, + "ingredient": "basemetals:antimony_gear", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_helmet.json b/src/generated/resources/data/basemetals/recipe/antimony_helmet.json index 16301ef4e..6e4ae594b 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:antimony_helmet", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_helmet_plate_repair.json index 142f74cc5..a9f059e25 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/antimony" - }, + "plate": "#forge:plates/antimony", "target": "basemetals:antimony_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_helmet_recycling.json index ed894be66..d692668f2 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_helmet" - }, + "ingredient": "basemetals:antimony_helmet", "result": { "count": 5, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_hoe.json b/src/generated/resources/data/basemetals/recipe/antimony_hoe.json index 10ea5d7c3..e06837053 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/antimony" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_hoe_recycling.json index 5420b665f..77188900e 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_hoe" - }, + "ingredient": "basemetals:antimony_hoe", "result": { "count": 2, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_horsearmor.json b/src/generated/resources/data/basemetals/recipe/antimony_horsearmor.json index fad46faed..e2b639987 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/antimony" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json index 51a6b75d9..9e4493168 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/antimony" - }, + "ingredient": "#forge:ingots/antimony", "result": { "id": "basemetals:antimony_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/antimony_ingot_from_nuggets.json index 788f2a589..f2036f905 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:antimony_ingot", "key": { - "X": { - "tag": "forge:nuggets/antimony" - } + "X": "#forge:nuggets/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_leggings.json b/src/generated/resources/data/basemetals/recipe/antimony_leggings.json index 09bc87430..6c8d9ce19 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:antimony_leggings", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_leggings_plate_repair.json index 738871919..ddc14b710 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/antimony" - }, + "plate": "#forge:plates/antimony", "target": "basemetals:antimony_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_leggings_recycling.json index 9c7086d20..a9c061a9b 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_leggings" - }, + "ingredient": "basemetals:antimony_leggings", "result": { "count": 7, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_lever.json b/src/generated/resources/data/basemetals/recipe/antimony_lever.json index 3d699416b..c4cbb3c70 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_lever.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:antimony_lever", "key": { - "R": { - "tag": "forge:rods/antimony" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "R": "#forge:rods/antimony", + "X": "#forge:ingots/antimony" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_lever_recycling.json index d146bcad1..1e820b1aa 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_lever" - }, + "ingredient": "basemetals:antimony_lever", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json index cf2453879..68cfd0ce9 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/antimony" - }, + "ingredient": "#forge:nuggets/antimony", "result": { "id": "basemetals:antimony_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_nuggets.json b/src/generated/resources/data/basemetals/recipe/antimony_nuggets.json index e3338ae79..95a7d4805 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:antimony_nugget", "ingredients": [ - { - "tag": "forge:ingots/antimony" - } + "#forge:ingots/antimony" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_blasting.json index 3c04ef788..4f2bc518c 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/antimony" - }, + "ingredient": "#forge:ores/antimony", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json index efc89fed0..9711403f5 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/antimony" - }, + "ingredient": "#forge:ores/antimony", "result": { "count": 2, "id": "basemetals:antimony_powder" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_ore_smelting.json index d46feac12..7aeb950b1 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/antimony" - }, + "ingredient": "#forge:ores/antimony", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_pickaxe.json b/src/generated/resources/data/basemetals/recipe/antimony_pickaxe.json index 9fe341fa1..e0335da9b 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_pickaxe_recycling.json index 2d4092a51..9ec84f49f 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_pickaxe" - }, + "ingredient": "basemetals:antimony_pickaxe", "result": { "count": 3, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_plate.json b/src/generated/resources/data/basemetals/recipe/antimony_plate.json index 81eaa68b6..55e979bd7 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_plate.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_plate", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_plate_recycling.json index a7ef8f1d7..8e8587826 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_plate" - }, + "ingredient": "basemetals:antimony_plate", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/antimony_powder_from_small.json index 9445bd7c1..45b97974a 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:antimony_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/antimony" - } + "X": "#forge:tiny_dusts/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_powder_smelting.json index 8c4a5cf3f..4a76c432a 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/antimony" - }, + "ingredient": "#forge:dusts/antimony", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate.json index 7aab1ab99..85fa8da93 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate_recycling.json index 8708bc57f..730680173 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_pressure_plate" - }, + "ingredient": "basemetals:antimony_pressure_plate", "result": { "count": 2, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_blasting.json index 29dd5c890..c00bf8629 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/antimony" - }, + "ingredient": "#forge:raw_materials/antimony", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json index 6154c6f3e..4fda2b4be 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/antimony" - }, + "ingredient": "#forge:raw_materials/antimony", "result": { "id": "basemetals:antimony_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_raw_smelting.json index 2078722b9..5198e7bc3 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/antimony" - }, + "ingredient": "#forge:raw_materials/antimony", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_rod.json b/src/generated/resources/data/basemetals/recipe/antimony_rod.json index b75daae01..30513ef47 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_rod.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:antimony_rod", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_rod_recycling.json index a563663b3..780580914 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:antimony_rod" - }, + "ingredient": "basemetals:antimony_rod", "result": { "count": 4, "id": "basemetals:antimony_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_scythe.json b/src/generated/resources/data/basemetals/recipe/antimony_scythe.json index 0431f60b4..52b7713ea 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/antimony" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_shears.json b/src/generated/resources/data/basemetals/recipe/antimony_shears.json index 8de4e3724..661edaab4 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_shears.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:antimony_shears", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_shears_recycling.json index 6a39e0141..8b35f0879 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_shears" - }, + "ingredient": "basemetals:antimony_shears", "result": { "count": 2, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_shield.json b/src/generated/resources/data/basemetals/recipe/antimony_shield.json index 5f8e6598b..d4477cd32 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_shield.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/antimony" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/antimony_shield_plate_repair.json index de949d9dd..e59a666b3 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/antimony" - }, + "plate": "#forge:plates/antimony", "target": "basemetals:antimony_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/antimony_shovel.json b/src/generated/resources/data/basemetals/recipe/antimony_shovel.json index 050003c97..0493c5225 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/antimony" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_shovel_recycling.json index 1345c4c07..63c83945c 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_shovel" - }, + "ingredient": "basemetals:antimony_shovel", "result": { "id": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_slab.json b/src/generated/resources/data/basemetals/recipe/antimony_slab.json index c46c96093..c7e24c0de 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_slab.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_slab", "key": { - "X": { - "tag": "forge:storage_blocks/antimony" - } + "X": "#forge:storage_blocks/antimony" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_slab_recycling.json index 140e2df88..0beeed5ca 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:antimony_slab" - }, + "ingredient": "basemetals:antimony_slab", "result": { "count": 4, "id": "basemetals:antimony_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_smallpowder.json b/src/generated/resources/data/basemetals/recipe/antimony_smallpowder.json index 41a8f9e39..c4df5be25 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:antimony_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/antimony" - } + "#forge:dusts/antimony" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/antimony_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/antimony_smallpowder_smelting.json index afae0b871..36e13bcfd 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/antimony" - }, + "ingredient": "#forge:tiny_dusts/antimony", "result": { "id": "basemetals:antimony_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/antimony_stairs.json b/src/generated/resources/data/basemetals/recipe/antimony_stairs.json index 2b11ca4a4..35ce1b114 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/antimony" - } + "X": "#forge:storage_blocks/antimony" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_sword.json b/src/generated/resources/data/basemetals/recipe/antimony_sword.json index ea1f68aef..f8905c4fe 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_sword.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:antimony_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/antimony" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/antimony" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_sword_recycling.json index 9512682b9..67a8111fd 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_sword" - }, + "ingredient": "basemetals:antimony_sword", "result": { "count": 2, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_trapdoor.json b/src/generated/resources/data/basemetals/recipe/antimony_trapdoor.json index fa075b509..90e308bac 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_trapdoor", "key": { - "X": { - "tag": "forge:ingots/antimony" - } + "X": "#forge:ingots/antimony" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_trapdoor_recycling.json index 86d8dbed4..ab9e6b3dc 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:antimony_trapdoor" - }, + "ingredient": "basemetals:antimony_trapdoor", "result": { "count": 4, "id": "basemetals:antimony_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/antimony_wall.json b/src/generated/resources/data/basemetals/recipe/antimony_wall.json index 778290634..37e598b4c 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_wall.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:antimony_wall", "key": { - "X": { - "tag": "forge:storage_blocks/antimony" - } + "X": "#forge:storage_blocks/antimony" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/antimony_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/antimony_wall_recycling.json index 9360eb7af..1c77f0962 100644 --- a/src/generated/resources/data/basemetals/recipe/antimony_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/antimony_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:antimony_wall" - }, + "ingredient": "basemetals:antimony_wall", "result": { "id": "basemetals:antimony_block" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_arrow.json b/src/generated/resources/data/basemetals/recipe/aquarium_arrow.json index 0b4dbbf37..4e7cbd8a1 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:aquarium_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/aquarium" - }, - "R": { - "tag": "forge:rods/aquarium" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/aquarium", + "R": "#forge:rods/aquarium" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_arrow_recycling.json index 88d87cd65..a6a202e28 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:aquarium_arrow" - }, + "ingredient": "basemetals:aquarium_arrow", "result": { "id": "basemetals:aquarium_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_axe.json b/src/generated/resources/data/basemetals/recipe/aquarium_axe.json index 0eef37726..85918703a 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_axe.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/aquarium" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_axe_recycling.json index 6ad848655..7b92e1957 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_axe" - }, + "ingredient": "basemetals:aquarium_axe", "result": { "count": 3, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bars.json b/src/generated/resources/data/basemetals/recipe/aquarium_bars.json index f7c4f1b0a..87356899e 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bars.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_bars", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bars_2.json b/src/generated/resources/data/basemetals/recipe/aquarium_bars_2.json index 25c253aab..095725247 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_bars", "key": { - "X": { - "tag": "forge:rods/aquarium" - } + "X": "#forge:rods/aquarium" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_bars_recycling.json index 52068c2fa..ee20875ab 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:aquarium_bars" - }, + "ingredient": "basemetals:aquarium_bars", "result": { "count": 3, "id": "basemetals:aquarium_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_blend.json b/src/generated/resources/data/basemetals/recipe/aquarium_blend.json index 56dd1446e..09c69cd49 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_blend.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_blend.json @@ -5,18 +5,10 @@ "category": "misc", "group": "basemetals:aquarium_blend", "ingredients": [ - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/zinc" - }, - { - "tag": "forge:dusts/prismarine" - } + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/zinc", + "#forge:dusts/prismarine" ], "result": { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/aquarium_blend_from_small.json index 55a8e4980..8702bcedf 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_blend", "key": { - "X": { - "tag": "forge:small_blends/aquarium" - } + "X": "#forge:small_blends/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_blend_smelting.json index 1630ff74d..46eccc00b 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "tag": "forge:blends/aquarium" - }, + "ingredient": "#forge:blends/aquarium", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_block.json b/src/generated/resources/data/basemetals/recipe/aquarium_block.json index 567707cef..978ad6216 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_block.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_block", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json index a172aee8d..37d6e6742 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/aquarium" - }, + "ingredient": "#forge:storage_blocks/aquarium", "result": { "count": 9, "id": "basemetals:aquarium_powder" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/recipe/aquarium_block_ingot.json index caad0260c..b5b6c8316 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/aquarium" - } + "#forge:storage_blocks/aquarium" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bolt.json b/src/generated/resources/data/basemetals/recipe/aquarium_bolt.json index be29cce7e..5c0686d25 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/aquarium" - } + "F": "minecraft:feather", + "R": "#forge:rods/aquarium" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_bolt_recycling.json index c24646b93..919d10f08 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:aquarium_bolt" - }, + "ingredient": "basemetals:aquarium_bolt", "result": { "count": 2, "id": "basemetals:aquarium_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_boots.json b/src/generated/resources/data/basemetals/recipe/aquarium_boots.json index 54596e9e9..b76924cc0 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_boots.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:aquarium_boots", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_boots_recycling.json index 80d8501bf..5302073ba 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_boots" - }, + "ingredient": "basemetals:aquarium_boots", "result": { "count": 4, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bow.json b/src/generated/resources/data/basemetals/recipe/aquarium_bow.json index 91a72d2af..446a30907 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bow.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_bow", "key": { - "R": { - "tag": "forge:rods/aquarium" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/aquarium", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_bow_recycling.json index fccf2f31a..3bc16b95a 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_bow" - }, + "ingredient": "basemetals:aquarium_bow", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_button.json b/src/generated/resources/data/basemetals/recipe/aquarium_button.json index db30a0356..f8f453313 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_button.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_button", "key": { - "X": { - "tag": "forge:nuggets/aquarium" - } + "X": "#forge:nuggets/aquarium" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_button_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_button_recycling.json index 12166c598..fd3956485 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:aquarium_button" - }, + "ingredient": "basemetals:aquarium_button", "result": { "count": 2, "id": "basemetals:aquarium_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_chestplate.json b/src/generated/resources/data/basemetals/recipe/aquarium_chestplate.json index fe6f74a96..bee84eadb 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:aquarium_chestplate", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_chestplate_recycling.json index 6c7369306..8b4bbe3b6 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_chestplate" - }, + "ingredient": "basemetals:aquarium_chestplate", "result": { "count": 8, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer.json index b262e0016..579e196b8 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/aquarium" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer_recycling.json index 4fadd6dd0..a9592acfc 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:aquarium_crackhammer" - }, + "ingredient": "basemetals:aquarium_crackhammer", "result": { "id": "basemetals:aquarium_block" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_crossbow.json b/src/generated/resources/data/basemetals/recipe/aquarium_crossbow.json index 63bc92d11..b23125bd0 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:aquarium_crossbow", "key": { - "G": { - "tag": "forge:gears/aquarium" - }, - "R": { - "tag": "forge:rods/aquarium" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/aquarium", + "R": "#forge:rods/aquarium", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_crossbow_recycling.json index ab910e537..bd2fcd45c 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_crossbow" - }, + "ingredient": "basemetals:aquarium_crossbow", "result": { "count": 4, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_door.json b/src/generated/resources/data/basemetals/recipe/aquarium_door.json index ae4c53b63..cb3877637 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_door.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_door", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_door_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_door_recycling.json index c60f3dfbf..7b7fdb7b0 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_door" - }, + "ingredient": "basemetals:aquarium_door", "result": { "count": 2, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/recipe/aquarium_fishingrod.json index bd281f976..dab761b9f 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_fishing_rod", "key": { - "R": { - "tag": "forge:rods/aquarium" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/aquarium", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_gear.json b/src/generated/resources/data/basemetals/recipe/aquarium_gear.json index 22c679db4..8342d63ad 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_gear.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:aquarium_gear", "key": { - "R": { - "tag": "forge:rods/aquarium" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "R": "#forge:rods/aquarium", + "X": "#forge:ingots/aquarium" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_gear_recycling.json index 8a53b98c3..140c0428a 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_gear" - }, + "ingredient": "basemetals:aquarium_gear", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_helmet.json b/src/generated/resources/data/basemetals/recipe/aquarium_helmet.json index 26f1ad8b0..7ecfbb864 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:aquarium_helmet", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_helmet_recycling.json index 9635f0167..ecbce8d62 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_helmet" - }, + "ingredient": "basemetals:aquarium_helmet", "result": { "count": 5, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_hoe.json b/src/generated/resources/data/basemetals/recipe/aquarium_hoe.json index 8f0e1a6c8..550c5c24a 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/aquarium" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_hoe_recycling.json index 22ed7d466..6ae251b04 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_hoe" - }, + "ingredient": "basemetals:aquarium_hoe", "result": { "count": 2, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/recipe/aquarium_horsearmor.json index 924e6f70d..c08a87710 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/aquarium" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json index 7dbbc253d..3a4ccf38b 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/aquarium" - }, + "ingredient": "#forge:ingots/aquarium", "result": { "id": "basemetals:aquarium_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_from_nuggets.json index 759b8114d..e793b5e9e 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_ingot", "key": { - "X": { - "tag": "forge:nuggets/aquarium" - } + "X": "#forge:nuggets/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_leggings.json b/src/generated/resources/data/basemetals/recipe/aquarium_leggings.json index 82c984f42..4fac1fcc3 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:aquarium_leggings", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_leggings_recycling.json index fe4213f18..a2f8a0eb6 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_leggings" - }, + "ingredient": "basemetals:aquarium_leggings", "result": { "count": 7, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_lever.json b/src/generated/resources/data/basemetals/recipe/aquarium_lever.json index acee32af4..ed3c3287a 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_lever.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:aquarium_lever", "key": { - "R": { - "tag": "forge:rods/aquarium" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "R": "#forge:rods/aquarium", + "X": "#forge:ingots/aquarium" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_lever_recycling.json index f647fa98a..cada33cf7 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_lever" - }, + "ingredient": "basemetals:aquarium_lever", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json index feeb619ce..a04c27f3c 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/aquarium" - }, + "ingredient": "#forge:nuggets/aquarium", "result": { "id": "basemetals:aquarium_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_nuggets.json b/src/generated/resources/data/basemetals/recipe/aquarium_nuggets.json index 6ca33363a..ee9aeaae0 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_nugget", "ingredients": [ - { - "tag": "forge:ingots/aquarium" - } + "#forge:ingots/aquarium" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe.json index 52b8c479a..dfcefdb5c 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe_recycling.json index 87eadc0c7..298353d48 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_pickaxe" - }, + "ingredient": "basemetals:aquarium_pickaxe", "result": { "count": 3, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_plate.json b/src/generated/resources/data/basemetals/recipe/aquarium_plate.json index 6bfe30944..a53798395 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_plate.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_plate", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_plate_recycling.json index 0edd46b14..511d6380c 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_plate" - }, + "ingredient": "basemetals:aquarium_plate", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/aquarium_powder_from_small.json index bef4b7d54..0f42e5419 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/aquarium" - } + "X": "#forge:tiny_dusts/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_powder_smelting.json index c45d195b5..ee3e80ed3 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "tag": "forge:dusts/aquarium" - }, + "ingredient": "#forge:dusts/aquarium", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate.json index 5bfadcb48..bfd5e6009 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate_recycling.json index 7e14b684e..21207291e 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_pressure_plate" - }, + "ingredient": "basemetals:aquarium_pressure_plate", "result": { "count": 2, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_rod.json b/src/generated/resources/data/basemetals/recipe/aquarium_rod.json index d67316af1..62b75a700 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_rod.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_rod", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_rod_recycling.json index 8d210522d..b75f412bd 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:aquarium_rod" - }, + "ingredient": "basemetals:aquarium_rod", "result": { "count": 4, "id": "basemetals:aquarium_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_scythe.json b/src/generated/resources/data/basemetals/recipe/aquarium_scythe.json index 6f0e178c7..50d34a829 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/aquarium" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_shears.json b/src/generated/resources/data/basemetals/recipe/aquarium_shears.json index a8ba67669..503cee45e 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_shears.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:aquarium_shears", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_shears_recycling.json index 65b042a44..6fa244231 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_shears" - }, + "ingredient": "basemetals:aquarium_shears", "result": { "count": 2, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_shield.json b/src/generated/resources/data/basemetals/recipe/aquarium_shield.json index 8a67b8dfb..49be7b9b4 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_shield.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/aquarium" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_shovel.json b/src/generated/resources/data/basemetals/recipe/aquarium_shovel.json index 0070121b1..0b563126f 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/aquarium" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_shovel_recycling.json index d6f405b52..54f781335 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_shovel" - }, + "ingredient": "basemetals:aquarium_shovel", "result": { "id": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_slab.json b/src/generated/resources/data/basemetals/recipe/aquarium_slab.json index 41c603e59..176610d7c 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_slab.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_slab", "key": { - "X": { - "tag": "forge:storage_blocks/aquarium" - } + "X": "#forge:storage_blocks/aquarium" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_slab_recycling.json index d2d4eb8ed..55c702d11 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:aquarium_slab" - }, + "ingredient": "basemetals:aquarium_slab", "result": { "count": 4, "id": "basemetals:aquarium_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_smallblend.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallblend.json index dc20f4f2b..de0b11f4f 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_smallblend", "ingredients": [ - { - "tag": "forge:blends/aquarium" - } + "#forge:blends/aquarium" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallblend_smelting.json index 1443fd1df..6ba6642b7 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "tag": "forge:small_blends/aquarium" - }, + "ingredient": "#forge:small_blends/aquarium", "result": { "id": "basemetals:aquarium_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder.json index 426e3e82e..8f1169af2 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:aquarium_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/aquarium" - } + "#forge:dusts/aquarium" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder_smelting.json index fc3dda91d..3591856c9 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "tag": "forge:tiny_dusts/aquarium" - }, + "ingredient": "#forge:tiny_dusts/aquarium", "result": { "id": "basemetals:aquarium_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_stairs.json b/src/generated/resources/data/basemetals/recipe/aquarium_stairs.json index 2eb2688f6..c73694752 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/aquarium" - } + "X": "#forge:storage_blocks/aquarium" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_sword.json b/src/generated/resources/data/basemetals/recipe/aquarium_sword.json index 1356f3500..0a674ed02 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_sword.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:aquarium_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/aquarium" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/aquarium" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_sword_recycling.json index 3f01f7c90..b7c4c5a42 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_sword" - }, + "ingredient": "basemetals:aquarium_sword", "result": { "count": 2, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor.json index 45e183895..bd95d6f9c 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_trapdoor", "key": { - "X": { - "tag": "forge:ingots/aquarium" - } + "X": "#forge:ingots/aquarium" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor_recycling.json index 5495a2e4c..da6060b88 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:aquarium_trapdoor" - }, + "ingredient": "basemetals:aquarium_trapdoor", "result": { "count": 4, "id": "basemetals:aquarium_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_wall.json b/src/generated/resources/data/basemetals/recipe/aquarium_wall.json index 20083461d..374b5444f 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_wall.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:aquarium_wall", "key": { - "X": { - "tag": "forge:storage_blocks/aquarium" - } + "X": "#forge:storage_blocks/aquarium" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/aquarium_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/aquarium_wall_recycling.json index 8dc57ea4d..bf9175774 100644 --- a/src/generated/resources/data/basemetals/recipe/aquarium_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/aquarium_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:aquarium_wall" - }, + "ingredient": "basemetals:aquarium_wall", "result": { "id": "basemetals:aquarium_block" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_arrow.json b/src/generated/resources/data/basemetals/recipe/bismuth_arrow.json index 8fdb51461..592ea787e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:bismuth_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/bismuth" - }, - "R": { - "tag": "forge:rods/bismuth" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/bismuth", + "R": "#forge:rods/bismuth" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_arrow_recycling.json index ec9bdb05f..5352b6fc1 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:bismuth_arrow" - }, + "ingredient": "basemetals:bismuth_arrow", "result": { "id": "basemetals:bismuth_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_axe.json b/src/generated/resources/data/basemetals/recipe/bismuth_axe.json index 1c88dea63..f9c811429 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_axe.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bismuth" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_axe_recycling.json index 4fc95ecc1..871a3a40c 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_axe" - }, + "ingredient": "basemetals:bismuth_axe", "result": { "count": 3, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bars.json b/src/generated/resources/data/basemetals/recipe/bismuth_bars.json index 92e6c747e..d138e08ec 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bars.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_bars", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bars_2.json b/src/generated/resources/data/basemetals/recipe/bismuth_bars_2.json index 915a902a2..51753eb6c 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_bars", "key": { - "X": { - "tag": "forge:rods/bismuth" - } + "X": "#forge:rods/bismuth" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_bars_recycling.json index 38306d097..ceba6c599 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:bismuth_bars" - }, + "ingredient": "basemetals:bismuth_bars", "result": { "count": 3, "id": "basemetals:bismuth_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_block.json b/src/generated/resources/data/basemetals/recipe/bismuth_block.json index 3f670f793..06129cbef 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_block.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_block", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json index 057f40b69..aa757feb2 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/bismuth" - }, + "ingredient": "#forge:storage_blocks/bismuth", "result": { "count": 9, "id": "basemetals:bismuth_powder" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/recipe/bismuth_block_ingot.json index 452fc2755..7d0e56dec 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bismuth_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/bismuth" - } + "#forge:storage_blocks/bismuth" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bolt.json b/src/generated/resources/data/basemetals/recipe/bismuth_bolt.json index a8e9b8b0a..4db43809a 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/bismuth" - } + "F": "minecraft:feather", + "R": "#forge:rods/bismuth" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_bolt_recycling.json index b5eb6b747..6f63b9d3c 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:bismuth_bolt" - }, + "ingredient": "basemetals:bismuth_bolt", "result": { "count": 2, "id": "basemetals:bismuth_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_boots.json b/src/generated/resources/data/basemetals/recipe/bismuth_boots.json index 9838ae40a..ed8191604 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_boots.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bismuth_boots", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_boots_plate_repair.json index 626eb387e..2e0721327 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bismuth" - }, + "plate": "#forge:plates/bismuth", "target": "basemetals:bismuth_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_boots_recycling.json index 609686c5d..068d6759e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_boots" - }, + "ingredient": "basemetals:bismuth_boots", "result": { "count": 4, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bow.json b/src/generated/resources/data/basemetals/recipe/bismuth_bow.json index 911b7e834..05796de45 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bow.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_bow", "key": { - "R": { - "tag": "forge:rods/bismuth" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/bismuth", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_bow_recycling.json index 949595b35..0cc17e5d5 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_bow" - }, + "ingredient": "basemetals:bismuth_bow", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_button.json b/src/generated/resources/data/basemetals/recipe/bismuth_button.json index 4c3802b16..08e6593a4 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_button.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_button", "key": { - "X": { - "tag": "forge:nuggets/bismuth" - } + "X": "#forge:nuggets/bismuth" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_button_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_button_recycling.json index ea6aac5fe..ceba61032 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:bismuth_button" - }, + "ingredient": "basemetals:bismuth_button", "result": { "count": 2, "id": "basemetals:bismuth_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_chestplate.json b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate.json index 23617c002..aac21984a 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bismuth_chestplate", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_plate_repair.json index d90ce3069..973491fb1 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bismuth" - }, + "plate": "#forge:plates/bismuth", "target": "basemetals:bismuth_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_recycling.json index d78264fdc..bec5ae582 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_chestplate" - }, + "ingredient": "basemetals:bismuth_chestplate", "result": { "count": 8, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer.json index 3ff697089..ee808d020 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/bismuth" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer_recycling.json index f52718c07..a358e80d6 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:bismuth_crackhammer" - }, + "ingredient": "basemetals:bismuth_crackhammer", "result": { "id": "basemetals:bismuth_block" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_crossbow.json b/src/generated/resources/data/basemetals/recipe/bismuth_crossbow.json index 6909bfecd..65ff68176 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:bismuth_crossbow", "key": { - "G": { - "tag": "forge:gears/bismuth" - }, - "R": { - "tag": "forge:rods/bismuth" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/bismuth", + "R": "#forge:rods/bismuth", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_crossbow_recycling.json index e4659d25f..643c7b05b 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_crossbow" - }, + "ingredient": "basemetals:bismuth_crossbow", "result": { "count": 4, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_door.json b/src/generated/resources/data/basemetals/recipe/bismuth_door.json index f64b6be9c..6060fe99d 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_door.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_door", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_door_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_door_recycling.json index 32b6e752e..2563ee25e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_door" - }, + "ingredient": "basemetals:bismuth_door", "result": { "count": 2, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/recipe/bismuth_fishingrod.json index 02877d6c5..698882b05 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_fishing_rod", "key": { - "R": { - "tag": "forge:rods/bismuth" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/bismuth", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_gear.json b/src/generated/resources/data/basemetals/recipe/bismuth_gear.json index 748fece43..05fc77331 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_gear.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:bismuth_gear", "key": { - "R": { - "tag": "forge:rods/bismuth" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "R": "#forge:rods/bismuth", + "X": "#forge:ingots/bismuth" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_gear_recycling.json index 09406f94d..3b9dc9936 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_gear" - }, + "ingredient": "basemetals:bismuth_gear", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_helmet.json b/src/generated/resources/data/basemetals/recipe/bismuth_helmet.json index 5f712ac51..7ac80aeb5 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bismuth_helmet", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_helmet_plate_repair.json index 34125a520..cd1df6054 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bismuth" - }, + "plate": "#forge:plates/bismuth", "target": "basemetals:bismuth_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_helmet_recycling.json index b15207f9e..3e9824654 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_helmet" - }, + "ingredient": "basemetals:bismuth_helmet", "result": { "count": 5, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_hoe.json b/src/generated/resources/data/basemetals/recipe/bismuth_hoe.json index cc577a92e..4231ba96b 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bismuth" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_hoe_recycling.json index a383f7e63..f520cd8e9 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_hoe" - }, + "ingredient": "basemetals:bismuth_hoe", "result": { "count": 2, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/recipe/bismuth_horsearmor.json index 9c1fd7bb1..ede516546 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/bismuth" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json index 7613cc2ad..6f31a664b 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/bismuth" - }, + "ingredient": "#forge:ingots/bismuth", "result": { "id": "basemetals:bismuth_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_from_nuggets.json index 56361d6b1..26d90c779 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bismuth_ingot", "key": { - "X": { - "tag": "forge:nuggets/bismuth" - } + "X": "#forge:nuggets/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_leggings.json b/src/generated/resources/data/basemetals/recipe/bismuth_leggings.json index 4b74f8369..39a25cc66 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bismuth_leggings", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_leggings_plate_repair.json index c4314a8f9..55f02b342 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bismuth" - }, + "plate": "#forge:plates/bismuth", "target": "basemetals:bismuth_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_leggings_recycling.json index e128677a9..a44cc1244 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_leggings" - }, + "ingredient": "basemetals:bismuth_leggings", "result": { "count": 7, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_lever.json b/src/generated/resources/data/basemetals/recipe/bismuth_lever.json index 2501c6926..f5bac7346 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_lever.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:bismuth_lever", "key": { - "R": { - "tag": "forge:rods/bismuth" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "R": "#forge:rods/bismuth", + "X": "#forge:ingots/bismuth" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_lever_recycling.json index 54aeff015..3eb8bbf5b 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_lever" - }, + "ingredient": "basemetals:bismuth_lever", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json index cab315b21..3df640ca9 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/bismuth" - }, + "ingredient": "#forge:nuggets/bismuth", "result": { "id": "basemetals:bismuth_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_nuggets.json b/src/generated/resources/data/basemetals/recipe/bismuth_nuggets.json index 455d59f0d..7569eb9b4 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bismuth_nugget", "ingredients": [ - { - "tag": "forge:ingots/bismuth" - } + "#forge:ingots/bismuth" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_blasting.json index 72c4ddd37..e5b0ebd04 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/bismuth" - }, + "ingredient": "#forge:ores/bismuth", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json index 59b1a03d6..1b3388e95 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/bismuth" - }, + "ingredient": "#forge:ores/bismuth", "result": { "count": 2, "id": "basemetals:bismuth_powder" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_ore_smelting.json index 07526464a..a783364d7 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/bismuth" - }, + "ingredient": "#forge:ores/bismuth", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe.json index eae41f3bf..0eb54b29f 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe_recycling.json index bdb83bf15..55af5e1e4 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_pickaxe" - }, + "ingredient": "basemetals:bismuth_pickaxe", "result": { "count": 3, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_plate.json b/src/generated/resources/data/basemetals/recipe/bismuth_plate.json index 515bcf350..237222bb9 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_plate.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_plate", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_plate_recycling.json index f10b5951c..1fb252d1e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_plate" - }, + "ingredient": "basemetals:bismuth_plate", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/bismuth_powder_from_small.json index 205392e08..9bc97f1bb 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bismuth_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/bismuth" - } + "X": "#forge:tiny_dusts/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_powder_smelting.json index 8c5ad3681..e6054ac2e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/bismuth" - }, + "ingredient": "#forge:dusts/bismuth", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate.json index 559b4cf9f..c4e2cdc5e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate_recycling.json index 5f24d0ff5..f5eaedfb0 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_pressure_plate" - }, + "ingredient": "basemetals:bismuth_pressure_plate", "result": { "count": 2, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_blasting.json index 3f6c16b94..822757f34 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/bismuth" - }, + "ingredient": "#forge:raw_materials/bismuth", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json index f9b77a319..879a61f30 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/bismuth" - }, + "ingredient": "#forge:raw_materials/bismuth", "result": { "id": "basemetals:bismuth_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_raw_smelting.json index 35aff9946..10e055864 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/bismuth" - }, + "ingredient": "#forge:raw_materials/bismuth", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_rod.json b/src/generated/resources/data/basemetals/recipe/bismuth_rod.json index fb5f59c4e..a290bb80e 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_rod.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bismuth_rod", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_rod_recycling.json index 854ab62c6..33e414a58 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:bismuth_rod" - }, + "ingredient": "basemetals:bismuth_rod", "result": { "count": 4, "id": "basemetals:bismuth_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_scythe.json b/src/generated/resources/data/basemetals/recipe/bismuth_scythe.json index 698fd5146..535616c3b 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bismuth" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_shears.json b/src/generated/resources/data/basemetals/recipe/bismuth_shears.json index ebfc72d70..38603e1b6 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_shears.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bismuth_shears", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_shears_recycling.json index dbcb3fcab..289c2fca4 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_shears" - }, + "ingredient": "basemetals:bismuth_shears", "result": { "count": 2, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_shield.json b/src/generated/resources/data/basemetals/recipe/bismuth_shield.json index 1512aeeda..9842693e8 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_shield.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/bismuth" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bismuth_shield_plate_repair.json index 90ea38e9e..a41eecb39 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bismuth" - }, + "plate": "#forge:plates/bismuth", "target": "basemetals:bismuth_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_shovel.json b/src/generated/resources/data/basemetals/recipe/bismuth_shovel.json index 85c92fcae..c76abf3ae 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bismuth" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_shovel_recycling.json index aec819810..ba4bb0d8a 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_shovel" - }, + "ingredient": "basemetals:bismuth_shovel", "result": { "id": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_slab.json b/src/generated/resources/data/basemetals/recipe/bismuth_slab.json index ca8fd7215..a89cb44bc 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_slab.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_slab", "key": { - "X": { - "tag": "forge:storage_blocks/bismuth" - } + "X": "#forge:storage_blocks/bismuth" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_slab_recycling.json index 24f5f1f28..5dbd94a05 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:bismuth_slab" - }, + "ingredient": "basemetals:bismuth_slab", "result": { "count": 4, "id": "basemetals:bismuth_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder.json index c864f4117..994470e29 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bismuth_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/bismuth" - } + "#forge:dusts/bismuth" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder_smelting.json index dc5353709..848e90b4c 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/bismuth" - }, + "ingredient": "#forge:tiny_dusts/bismuth", "result": { "id": "basemetals:bismuth_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_stairs.json b/src/generated/resources/data/basemetals/recipe/bismuth_stairs.json index 4a30ff102..71a71fc52 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/bismuth" - } + "X": "#forge:storage_blocks/bismuth" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_sword.json b/src/generated/resources/data/basemetals/recipe/bismuth_sword.json index 379371ef6..20b6b55c6 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_sword.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bismuth_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bismuth" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bismuth" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_sword_recycling.json index 4fc98bc08..b94ddb0f3 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_sword" - }, + "ingredient": "basemetals:bismuth_sword", "result": { "count": 2, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor.json index 300a454f8..a48322f8d 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_trapdoor", "key": { - "X": { - "tag": "forge:ingots/bismuth" - } + "X": "#forge:ingots/bismuth" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor_recycling.json index c5a0f45bb..790eaf0d5 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:bismuth_trapdoor" - }, + "ingredient": "basemetals:bismuth_trapdoor", "result": { "count": 4, "id": "basemetals:bismuth_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_wall.json b/src/generated/resources/data/basemetals/recipe/bismuth_wall.json index cd3b34fe8..05c03f858 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_wall.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bismuth_wall", "key": { - "X": { - "tag": "forge:storage_blocks/bismuth" - } + "X": "#forge:storage_blocks/bismuth" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bismuth_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/bismuth_wall_recycling.json index 5e6b4de41..5809c1694 100644 --- a/src/generated/resources/data/basemetals/recipe/bismuth_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bismuth_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:bismuth_wall" - }, + "ingredient": "basemetals:bismuth_wall", "result": { "id": "basemetals:bismuth_block" } diff --git a/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json b/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json index fdbf16163..8a569f064 100644 --- a/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/blaze_rod_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:blaze_rod" - }, + "ingredient": "minecraft:blaze_rod", "result": { "count": 2, "id": "minecraft:blaze_powder" diff --git a/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json index 80e403af2..f86205aeb 100644 --- a/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bone_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:bone_block" - }, + "ingredient": "minecraft:bone_block", "result": { "count": 9, "id": "minecraft:bone_meal" diff --git a/src/generated/resources/data/basemetals/recipe/bone_crushing.json b/src/generated/resources/data/basemetals/recipe/bone_crushing.json index 421c0d40c..5d54f96e8 100644 --- a/src/generated/resources/data/basemetals/recipe/bone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:bone" - }, + "ingredient": "minecraft:bone", "result": { "count": 3, "id": "minecraft:bone_meal" diff --git a/src/generated/resources/data/basemetals/recipe/brass_arrow.json b/src/generated/resources/data/basemetals/recipe/brass_arrow.json index 589567c93..b2a523b8e 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/brass_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:brass_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/brass" - }, - "R": { - "tag": "forge:rods/brass" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/brass", + "R": "#forge:rods/brass" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/brass_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_arrow_recycling.json index 6dc8470a7..3711aa473 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:brass_arrow" - }, + "ingredient": "basemetals:brass_arrow", "result": { "id": "basemetals:brass_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_axe.json b/src/generated/resources/data/basemetals/recipe/brass_axe.json index 5f885956b..48f5d7e73 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_axe.json +++ b/src/generated/resources/data/basemetals/recipe/brass_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/brass" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_axe_recycling.json index 4d591d6eb..d407b5e8e 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_axe" - }, + "ingredient": "basemetals:brass_axe", "result": { "count": 3, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_bars.json b/src/generated/resources/data/basemetals/recipe/brass_bars.json index e9dc14282..76620eef2 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bars.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_bars", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_bars_2.json b/src/generated/resources/data/basemetals/recipe/brass_bars_2.json index 54825f93b..f314a3e28 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_bars", "key": { - "X": { - "tag": "forge:rods/brass" - } + "X": "#forge:rods/brass" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/brass_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_bars_recycling.json index 0570b7a0c..6c82e764f 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:brass_bars" - }, + "ingredient": "basemetals:brass_bars", "result": { "count": 3, "id": "basemetals:brass_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/brass_blend.json b/src/generated/resources/data/basemetals/recipe/brass_blend.json index 49f3443b0..55746a074 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_blend.json +++ b/src/generated/resources/data/basemetals/recipe/brass_blend.json @@ -5,18 +5,10 @@ "category": "misc", "group": "basemetals:brass_blend", "ingredients": [ - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/zinc" - } + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/zinc" ], "result": { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipe/brass_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/brass_blend_from_small.json index 575e5575f..7b4227ee9 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/brass_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_blend", "key": { - "X": { - "tag": "forge:small_blends/brass" - } + "X": "#forge:small_blends/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_blend_smelting.json index db67cb072..25fe958e5 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/brass_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "tag": "forge:blends/brass" - }, + "ingredient": "#forge:blends/brass", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_block.json b/src/generated/resources/data/basemetals/recipe/brass_block.json index 40a490913..188477ab5 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_block.json +++ b/src/generated/resources/data/basemetals/recipe/brass_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_block", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json index 29c39a1bb..14adaf4f4 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/brass_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/brass" - }, + "ingredient": "#forge:storage_blocks/brass", "result": { "count": 9, "id": "basemetals:brass_powder" diff --git a/src/generated/resources/data/basemetals/recipe/brass_block_ingot.json b/src/generated/resources/data/basemetals/recipe/brass_block_ingot.json index a4a7d5da6..f79da02dc 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/brass_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/brass" - } + "#forge:storage_blocks/brass" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/brass_bolt.json b/src/generated/resources/data/basemetals/recipe/brass_bolt.json index feeaedc3c..afb8c0f61 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/brass" - } + "F": "minecraft:feather", + "R": "#forge:rods/brass" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/brass_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_bolt_recycling.json index a0210e766..a22327065 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:brass_bolt" - }, + "ingredient": "basemetals:brass_bolt", "result": { "count": 2, "id": "basemetals:brass_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/brass_boots.json b/src/generated/resources/data/basemetals/recipe/brass_boots.json index 89d70e0c8..eb3413f34 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_boots.json +++ b/src/generated/resources/data/basemetals/recipe/brass_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:brass_boots", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_boots_plate_repair.json index 2aab41ac3..eb3d37cfa 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/brass_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/brass" - }, + "plate": "#forge:plates/brass", "target": "basemetals:brass_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_boots_recycling.json index 71d112a36..f65223745 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_boots" - }, + "ingredient": "basemetals:brass_boots", "result": { "count": 4, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_bow.json b/src/generated/resources/data/basemetals/recipe/brass_bow.json index 7ccc928da..ac3acd4a1 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bow.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_bow", "key": { - "R": { - "tag": "forge:rods/brass" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/brass", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/brass_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_bow_recycling.json index f0f09c3cd..1a9364e74 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_bow" - }, + "ingredient": "basemetals:brass_bow", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_button.json b/src/generated/resources/data/basemetals/recipe/brass_button.json index 22608df19..9e9491709 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_button.json +++ b/src/generated/resources/data/basemetals/recipe/brass_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_button", "key": { - "X": { - "tag": "forge:nuggets/brass" - } + "X": "#forge:nuggets/brass" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_button_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_button_recycling.json index 2fa47464e..0435029b5 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:brass_button" - }, + "ingredient": "basemetals:brass_button", "result": { "count": 2, "id": "basemetals:brass_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/brass_chestplate.json b/src/generated/resources/data/basemetals/recipe/brass_chestplate.json index 5151f5d63..443d21b5f 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/brass_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:brass_chestplate", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_chestplate_plate_repair.json index 506d68389..4c3e09aaf 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/brass_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/brass" - }, + "plate": "#forge:plates/brass", "target": "basemetals:brass_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_chestplate_recycling.json index d84afc3b0..6fe25aa46 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_chestplate" - }, + "ingredient": "basemetals:brass_chestplate", "result": { "count": 8, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_crackhammer.json b/src/generated/resources/data/basemetals/recipe/brass_crackhammer.json index e1220a3a5..cba3656d1 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/brass_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/brass" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_crackhammer_recycling.json index 3f5f2d690..21fab87fe 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:brass_crackhammer" - }, + "ingredient": "basemetals:brass_crackhammer", "result": { "id": "basemetals:brass_block" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_crossbow.json b/src/generated/resources/data/basemetals/recipe/brass_crossbow.json index 3801d70b3..4f7b2c74c 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/brass_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:brass_crossbow", "key": { - "G": { - "tag": "forge:gears/brass" - }, - "R": { - "tag": "forge:rods/brass" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/brass", + "R": "#forge:rods/brass", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/brass_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_crossbow_recycling.json index c21ed61c4..699415bdc 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_crossbow" - }, + "ingredient": "basemetals:brass_crossbow", "result": { "count": 4, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_door.json b/src/generated/resources/data/basemetals/recipe/brass_door.json index 6ce0d3d8b..6bafed30f 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_door.json +++ b/src/generated/resources/data/basemetals/recipe/brass_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_door", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_door_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_door_recycling.json index 940ea5ef4..00020bfa0 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_door" - }, + "ingredient": "basemetals:brass_door", "result": { "count": 2, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_fishingrod.json b/src/generated/resources/data/basemetals/recipe/brass_fishingrod.json index 56715039c..7bec7c757 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/brass_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_fishing_rod", "key": { - "R": { - "tag": "forge:rods/brass" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/brass", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/brass_gear.json b/src/generated/resources/data/basemetals/recipe/brass_gear.json index ae40b12e4..26cc7fc4c 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_gear.json +++ b/src/generated/resources/data/basemetals/recipe/brass_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:brass_gear", "key": { - "R": { - "tag": "forge:rods/brass" - }, - "X": { - "tag": "forge:ingots/brass" - } + "R": "#forge:rods/brass", + "X": "#forge:ingots/brass" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/brass_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_gear_recycling.json index c6e06c075..0bc4dcc47 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_gear" - }, + "ingredient": "basemetals:brass_gear", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_helmet.json b/src/generated/resources/data/basemetals/recipe/brass_helmet.json index c415bba71..aad115e2d 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/brass_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:brass_helmet", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_helmet_plate_repair.json index 880d3a2f4..42d59534c 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/brass_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/brass" - }, + "plate": "#forge:plates/brass", "target": "basemetals:brass_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_helmet_recycling.json index 5c4d1e030..b3567bac5 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_helmet" - }, + "ingredient": "basemetals:brass_helmet", "result": { "count": 5, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_hoe.json b/src/generated/resources/data/basemetals/recipe/brass_hoe.json index 4be1aaef6..a50e37024 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/brass_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/brass" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_hoe_recycling.json index 5a49e590b..5c941a9b3 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_hoe" - }, + "ingredient": "basemetals:brass_hoe", "result": { "count": 2, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_horsearmor.json b/src/generated/resources/data/basemetals/recipe/brass_horsearmor.json index 03fa4f8b2..bc62deef0 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/brass_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/brass" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/brass" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json index 3c14ee56a..a37230dfe 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/brass_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/brass" - }, + "ingredient": "#forge:ingots/brass", "result": { "id": "basemetals:brass_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/brass_ingot_from_nuggets.json index 5ae90f6c3..fc16dc7f1 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/brass_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_ingot", "key": { - "X": { - "tag": "forge:nuggets/brass" - } + "X": "#forge:nuggets/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_leggings.json b/src/generated/resources/data/basemetals/recipe/brass_leggings.json index 04c6e120e..750bdfc0e 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/brass_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:brass_leggings", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_leggings_plate_repair.json index ca666f611..3ced88fff 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/brass_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/brass" - }, + "plate": "#forge:plates/brass", "target": "basemetals:brass_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_leggings_recycling.json index a8597ec96..28033c07c 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_leggings" - }, + "ingredient": "basemetals:brass_leggings", "result": { "count": 7, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_lever.json b/src/generated/resources/data/basemetals/recipe/brass_lever.json index aa6eb407b..ec1123c77 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_lever.json +++ b/src/generated/resources/data/basemetals/recipe/brass_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:brass_lever", "key": { - "R": { - "tag": "forge:rods/brass" - }, - "X": { - "tag": "forge:ingots/brass" - } + "R": "#forge:rods/brass", + "X": "#forge:ingots/brass" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/brass_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_lever_recycling.json index da90278b7..4af5a1866 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_lever" - }, + "ingredient": "basemetals:brass_lever", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json index cc414d017..d6711a496 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/brass_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/brass" - }, + "ingredient": "#forge:nuggets/brass", "result": { "id": "basemetals:brass_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_nuggets.json b/src/generated/resources/data/basemetals/recipe/brass_nuggets.json index 383a0a9e2..6a1202b24 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/brass_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_nugget", "ingredients": [ - { - "tag": "forge:ingots/brass" - } + "#forge:ingots/brass" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/brass_pickaxe.json b/src/generated/resources/data/basemetals/recipe/brass_pickaxe.json index 973e70b52..90ee9fd31 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/brass_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_pickaxe_recycling.json index 5a847daf4..ea20377fb 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_pickaxe" - }, + "ingredient": "basemetals:brass_pickaxe", "result": { "count": 3, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_plate.json b/src/generated/resources/data/basemetals/recipe/brass_plate.json index f419afa18..2cee8ecca 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_plate.json +++ b/src/generated/resources/data/basemetals/recipe/brass_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_plate", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/brass_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_plate_recycling.json index b7d68b5da..3f3291aec 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_plate" - }, + "ingredient": "basemetals:brass_plate", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/brass_powder_from_small.json index 30f463c03..a08a38dc9 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/brass_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/brass" - } + "X": "#forge:tiny_dusts/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_powder_smelting.json index 9c8b26eb5..7f9e92b81 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/brass_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "tag": "forge:dusts/brass" - }, + "ingredient": "#forge:dusts/brass", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/brass_pressure_plate.json index ae91445af..193f36a5a 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/brass_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/brass_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_pressure_plate_recycling.json index 5d1184f07..51f0137d9 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_pressure_plate" - }, + "ingredient": "basemetals:brass_pressure_plate", "result": { "count": 2, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_rod.json b/src/generated/resources/data/basemetals/recipe/brass_rod.json index 06c3ac2ad..ed68e0aa4 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_rod.json +++ b/src/generated/resources/data/basemetals/recipe/brass_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_rod", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_rod_recycling.json index 0450b1669..9d0393d32 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:brass_rod" - }, + "ingredient": "basemetals:brass_rod", "result": { "count": 4, "id": "basemetals:brass_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/brass_scythe.json b/src/generated/resources/data/basemetals/recipe/brass_scythe.json index 78ebafdb8..d09055d26 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/brass_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/brass" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/brass_shears.json b/src/generated/resources/data/basemetals/recipe/brass_shears.json index ce6cc171b..37535ced0 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_shears.json +++ b/src/generated/resources/data/basemetals/recipe/brass_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:brass_shears", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_shears_recycling.json index 1282a9adc..a9f9faf58 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_shears" - }, + "ingredient": "basemetals:brass_shears", "result": { "count": 2, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_shield.json b/src/generated/resources/data/basemetals/recipe/brass_shield.json index 98915f667..dec0811e8 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_shield.json +++ b/src/generated/resources/data/basemetals/recipe/brass_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/brass" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/brass" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/brass_shield_plate_repair.json index 2496ffc7a..d099aa24b 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/brass_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/brass" - }, + "plate": "#forge:plates/brass", "target": "basemetals:brass_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/brass_shovel.json b/src/generated/resources/data/basemetals/recipe/brass_shovel.json index 218f80a1a..c2c7c04a2 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/brass_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/brass" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_shovel_recycling.json index 63863f116..59a11172c 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_shovel" - }, + "ingredient": "basemetals:brass_shovel", "result": { "id": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_slab.json b/src/generated/resources/data/basemetals/recipe/brass_slab.json index 47744cb82..06cfffb2a 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_slab.json +++ b/src/generated/resources/data/basemetals/recipe/brass_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_slab", "key": { - "X": { - "tag": "forge:storage_blocks/brass" - } + "X": "#forge:storage_blocks/brass" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/brass_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_slab_recycling.json index 56964840c..a715ef966 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:brass_slab" - }, + "ingredient": "basemetals:brass_slab", "result": { "count": 4, "id": "basemetals:brass_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/brass_smallblend.json b/src/generated/resources/data/basemetals/recipe/brass_smallblend.json index 82d6cdf53..12d1f97d9 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/brass_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_smallblend", "ingredients": [ - { - "tag": "forge:blends/brass" - } + "#forge:blends/brass" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/brass_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_smallblend_smelting.json index e878d2aff..73d499c8d 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/brass_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:small_blends/brass" - }, + "ingredient": "#forge:small_blends/brass", "result": { "id": "basemetals:brass_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_smallpowder.json b/src/generated/resources/data/basemetals/recipe/brass_smallpowder.json index 66e666c3d..861642f08 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/brass_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:brass_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/brass" - } + "#forge:dusts/brass" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/brass_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/brass_smallpowder_smelting.json index 220267232..4ea60692d 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/brass_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:tiny_dusts/brass" - }, + "ingredient": "#forge:tiny_dusts/brass", "result": { "id": "basemetals:brass_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/brass_stairs.json b/src/generated/resources/data/basemetals/recipe/brass_stairs.json index 00da14c1a..6f9a6a6ff 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/brass_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/brass" - } + "X": "#forge:storage_blocks/brass" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/brass_sword.json b/src/generated/resources/data/basemetals/recipe/brass_sword.json index 35067e4e8..4a0aa714b 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_sword.json +++ b/src/generated/resources/data/basemetals/recipe/brass_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:brass_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/brass" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/brass" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/brass_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_sword_recycling.json index a6955b369..74ff91ad6 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_sword" - }, + "ingredient": "basemetals:brass_sword", "result": { "count": 2, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_trapdoor.json b/src/generated/resources/data/basemetals/recipe/brass_trapdoor.json index 2152302d7..64826f02c 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/brass_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_trapdoor", "key": { - "X": { - "tag": "forge:ingots/brass" - } + "X": "#forge:ingots/brass" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_trapdoor_recycling.json index 26ae0ad1a..a530809d7 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:brass_trapdoor" - }, + "ingredient": "basemetals:brass_trapdoor", "result": { "count": 4, "id": "basemetals:brass_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/brass_wall.json b/src/generated/resources/data/basemetals/recipe/brass_wall.json index 820ffb4ac..daa0f9c79 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_wall.json +++ b/src/generated/resources/data/basemetals/recipe/brass_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:brass_wall", "key": { - "X": { - "tag": "forge:storage_blocks/brass" - } + "X": "#forge:storage_blocks/brass" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/brass_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/brass_wall_recycling.json index d74771381..897f7dd5f 100644 --- a/src/generated/resources/data/basemetals/recipe/brass_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/brass_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:brass_wall" - }, + "ingredient": "basemetals:brass_wall", "result": { "id": "basemetals:brass_block" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_arrow.json b/src/generated/resources/data/basemetals/recipe/bronze_arrow.json index 4a100ce9b..c425f29cf 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:bronze_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/bronze" - }, - "R": { - "tag": "forge:rods/bronze" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/bronze", + "R": "#forge:rods/bronze" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_arrow_recycling.json index 23c5a6b56..c2eceea1d 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:bronze_arrow" - }, + "ingredient": "basemetals:bronze_arrow", "result": { "id": "basemetals:bronze_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_axe.json b/src/generated/resources/data/basemetals/recipe/bronze_axe.json index c1b48c72f..8e2311545 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_axe.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bronze" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_axe_recycling.json index fa5810b53..f53e2ad6e 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_axe" - }, + "ingredient": "basemetals:bronze_axe", "result": { "count": 3, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bars.json b/src/generated/resources/data/basemetals/recipe/bronze_bars.json index 287472b85..e4b07065d 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bars.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_bars", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bars_2.json b/src/generated/resources/data/basemetals/recipe/bronze_bars_2.json index 06be99644..77577e3ce 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_bars", "key": { - "X": { - "tag": "forge:rods/bronze" - } + "X": "#forge:rods/bronze" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_bars_recycling.json index 723eb0b62..489396069 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:bronze_bars" - }, + "ingredient": "basemetals:bronze_bars", "result": { "count": 3, "id": "basemetals:bronze_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_blend.json b/src/generated/resources/data/basemetals/recipe/bronze_blend.json index 0b93d3e87..7e9007732 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_blend.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_blend.json @@ -5,18 +5,10 @@ "category": "misc", "group": "basemetals:bronze_blend", "ingredients": [ - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/tin" - } + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/tin" ], "result": { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipe/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/bronze_blend_from_small.json index 347ae6ea3..6ca02df59 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_blend", "key": { - "X": { - "tag": "forge:small_blends/bronze" - } + "X": "#forge:small_blends/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_blend_smelting.json index 90346d15f..9ed2f96df 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "tag": "forge:blends/bronze" - }, + "ingredient": "#forge:blends/bronze", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_block.json b/src/generated/resources/data/basemetals/recipe/bronze_block.json index 99fba0f4b..4d728323c 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_block.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_block", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json index 0fe5540f7..4f97891eb 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/bronze" - }, + "ingredient": "#forge:storage_blocks/bronze", "result": { "count": 9, "id": "basemetals:bronze_powder" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_block_ingot.json b/src/generated/resources/data/basemetals/recipe/bronze_block_ingot.json index 2699abec4..983186c87 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/bronze" - } + "#forge:storage_blocks/bronze" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bolt.json b/src/generated/resources/data/basemetals/recipe/bronze_bolt.json index 7e795d97f..c0bad6b28 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/bronze" - } + "F": "minecraft:feather", + "R": "#forge:rods/bronze" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_bolt_recycling.json index 625d326e0..b24eeb887 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:bronze_bolt" - }, + "ingredient": "basemetals:bronze_bolt", "result": { "count": 2, "id": "basemetals:bronze_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_boots.json b/src/generated/resources/data/basemetals/recipe/bronze_boots.json index f7674f6e2..380c419c5 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_boots.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bronze_boots", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_boots_plate_repair.json index b8c0fcc18..d7737939b 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bronze" - }, + "plate": "#forge:plates/bronze", "target": "basemetals:bronze_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_boots_recycling.json index 194bda484..154bd6cca 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_boots" - }, + "ingredient": "basemetals:bronze_boots", "result": { "count": 4, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bow.json b/src/generated/resources/data/basemetals/recipe/bronze_bow.json index 162227910..f45db1fcd 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bow.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_bow", "key": { - "R": { - "tag": "forge:rods/bronze" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/bronze", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_bow_recycling.json index a1e0a5308..d6e6cdc43 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_bow" - }, + "ingredient": "basemetals:bronze_bow", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_button.json b/src/generated/resources/data/basemetals/recipe/bronze_button.json index 214e39d75..e6eaa1ea1 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_button.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_button", "key": { - "X": { - "tag": "forge:nuggets/bronze" - } + "X": "#forge:nuggets/bronze" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_button_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_button_recycling.json index 74f16cc8c..4ac6b7351 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:bronze_button" - }, + "ingredient": "basemetals:bronze_button", "result": { "count": 2, "id": "basemetals:bronze_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_chestplate.json b/src/generated/resources/data/basemetals/recipe/bronze_chestplate.json index 8dfc67042..e55668e54 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bronze_chestplate", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_chestplate_plate_repair.json index d58d4f573..079e65e6f 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bronze" - }, + "plate": "#forge:plates/bronze", "target": "basemetals:bronze_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_chestplate_recycling.json index 6e2e94742..9255aaae2 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_chestplate" - }, + "ingredient": "basemetals:bronze_chestplate", "result": { "count": 8, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_crackhammer.json b/src/generated/resources/data/basemetals/recipe/bronze_crackhammer.json index 79a4da339..8f305b7f3 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/bronze" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_crackhammer_recycling.json index ab86a74db..0e34f7c3b 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:bronze_crackhammer" - }, + "ingredient": "basemetals:bronze_crackhammer", "result": { "id": "basemetals:bronze_block" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_crossbow.json b/src/generated/resources/data/basemetals/recipe/bronze_crossbow.json index 0c4cc175e..2ced7190f 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:bronze_crossbow", "key": { - "G": { - "tag": "forge:gears/bronze" - }, - "R": { - "tag": "forge:rods/bronze" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/bronze", + "R": "#forge:rods/bronze", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_crossbow_recycling.json index e5cf4d65c..680540d5f 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_crossbow" - }, + "ingredient": "basemetals:bronze_crossbow", "result": { "count": 4, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_door.json b/src/generated/resources/data/basemetals/recipe/bronze_door.json index 7d5ac0ce9..31c306a79 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_door.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_door", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_door_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_door_recycling.json index e7e25a3db..164f1ccb4 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_door" - }, + "ingredient": "basemetals:bronze_door", "result": { "count": 2, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_fishingrod.json b/src/generated/resources/data/basemetals/recipe/bronze_fishingrod.json index a2e93b6fa..e11749aef 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_fishing_rod", "key": { - "R": { - "tag": "forge:rods/bronze" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/bronze", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_gear.json b/src/generated/resources/data/basemetals/recipe/bronze_gear.json index 8eca2a907..d136c17a9 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_gear.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:bronze_gear", "key": { - "R": { - "tag": "forge:rods/bronze" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "R": "#forge:rods/bronze", + "X": "#forge:ingots/bronze" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_gear_recycling.json index ad3f464e4..0faea661c 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_gear" - }, + "ingredient": "basemetals:bronze_gear", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_helmet.json b/src/generated/resources/data/basemetals/recipe/bronze_helmet.json index 82b1573b3..3e38c6293 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bronze_helmet", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_helmet_plate_repair.json index 9d16d821e..ebae06366 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bronze" - }, + "plate": "#forge:plates/bronze", "target": "basemetals:bronze_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_helmet_recycling.json index d80fc6ebc..22d5a0d45 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_helmet" - }, + "ingredient": "basemetals:bronze_helmet", "result": { "count": 5, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_hoe.json b/src/generated/resources/data/basemetals/recipe/bronze_hoe.json index 321dc7195..2a31e5ef4 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bronze" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_hoe_recycling.json index 62a583168..216a6d78c 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_hoe" - }, + "ingredient": "basemetals:bronze_hoe", "result": { "count": 2, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_horsearmor.json b/src/generated/resources/data/basemetals/recipe/bronze_horsearmor.json index 793ddfd8c..76ad30c07 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/bronze" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json index 95c973fab..15921b53c 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/bronze" - }, + "ingredient": "#forge:ingots/bronze", "result": { "id": "basemetals:bronze_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/bronze_ingot_from_nuggets.json index 78f3d7f95..5cc8ad4ff 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_ingot", "key": { - "X": { - "tag": "forge:nuggets/bronze" - } + "X": "#forge:nuggets/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_leggings.json b/src/generated/resources/data/basemetals/recipe/bronze_leggings.json index 79d63bfe6..575602902 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bronze_leggings", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_leggings_plate_repair.json index f0c35ed2c..844f83d10 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bronze" - }, + "plate": "#forge:plates/bronze", "target": "basemetals:bronze_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_leggings_recycling.json index a4d585d22..a35d3db4d 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_leggings" - }, + "ingredient": "basemetals:bronze_leggings", "result": { "count": 7, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_lever.json b/src/generated/resources/data/basemetals/recipe/bronze_lever.json index c9d815b14..6058cecf1 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_lever.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:bronze_lever", "key": { - "R": { - "tag": "forge:rods/bronze" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "R": "#forge:rods/bronze", + "X": "#forge:ingots/bronze" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_lever_recycling.json index bf6405d29..96fc38256 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_lever" - }, + "ingredient": "basemetals:bronze_lever", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json index c39b5bf2a..839e3a040 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/bronze" - }, + "ingredient": "#forge:nuggets/bronze", "result": { "id": "basemetals:bronze_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_nuggets.json b/src/generated/resources/data/basemetals/recipe/bronze_nuggets.json index c8494ce8f..5e8302df2 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_nugget", "ingredients": [ - { - "tag": "forge:ingots/bronze" - } + "#forge:ingots/bronze" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bronze_pickaxe.json b/src/generated/resources/data/basemetals/recipe/bronze_pickaxe.json index ecb90b2a1..7c1a4cbe9 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_pickaxe_recycling.json index cf9014e0d..01162c776 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_pickaxe" - }, + "ingredient": "basemetals:bronze_pickaxe", "result": { "count": 3, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_plate.json b/src/generated/resources/data/basemetals/recipe/bronze_plate.json index d671d93af..0cd69e79d 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_plate.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_plate", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_plate_recycling.json index d753b3b51..c9359710c 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_plate" - }, + "ingredient": "basemetals:bronze_plate", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/bronze_powder_from_small.json index 967188a51..1d5023186 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/bronze" - } + "X": "#forge:tiny_dusts/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_powder_smelting.json index 5a28ae23c..4c15b6ee5 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "tag": "forge:dusts/bronze" - }, + "ingredient": "#forge:dusts/bronze", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate.json index 2f5a3a66a..db05a54f6 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate_recycling.json index c46ded133..2afe1918e 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_pressure_plate" - }, + "ingredient": "basemetals:bronze_pressure_plate", "result": { "count": 2, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_rod.json b/src/generated/resources/data/basemetals/recipe/bronze_rod.json index f4e2b7e1c..1d35ff473 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_rod.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_rod", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_rod_recycling.json index fb4bd1bea..59962da8b 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:bronze_rod" - }, + "ingredient": "basemetals:bronze_rod", "result": { "count": 4, "id": "basemetals:bronze_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_scythe.json b/src/generated/resources/data/basemetals/recipe/bronze_scythe.json index 3ae17eb75..a1adec2b1 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bronze" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_shears.json b/src/generated/resources/data/basemetals/recipe/bronze_shears.json index aefc85347..6c1dbc00f 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_shears.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:bronze_shears", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_shears_recycling.json index 5674a6904..42fc8a86f 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_shears" - }, + "ingredient": "basemetals:bronze_shears", "result": { "count": 2, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_shield.json b/src/generated/resources/data/basemetals/recipe/bronze_shield.json index 8cec29c90..9a89d2961 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_shield.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/bronze" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/bronze_shield_plate_repair.json index 060278379..00efccf0f 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/bronze" - }, + "plate": "#forge:plates/bronze", "target": "basemetals:bronze_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/bronze_shovel.json b/src/generated/resources/data/basemetals/recipe/bronze_shovel.json index c489a698b..7d1e17139 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bronze" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_shovel_recycling.json index 82b420d4b..0732d65b9 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_shovel" - }, + "ingredient": "basemetals:bronze_shovel", "result": { "id": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_slab.json b/src/generated/resources/data/basemetals/recipe/bronze_slab.json index de99af7d8..720d89bcd 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_slab.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_slab", "key": { - "X": { - "tag": "forge:storage_blocks/bronze" - } + "X": "#forge:storage_blocks/bronze" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_slab_recycling.json index fe2923555..580c2e1ad 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:bronze_slab" - }, + "ingredient": "basemetals:bronze_slab", "result": { "count": 4, "id": "basemetals:bronze_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_smallblend.json b/src/generated/resources/data/basemetals/recipe/bronze_smallblend.json index 5f311a263..e380c5e06 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_smallblend", "ingredients": [ - { - "tag": "forge:blends/bronze" - } + "#forge:blends/bronze" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bronze_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_smallblend_smelting.json index cb274f40b..e9f845bc9 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "tag": "forge:small_blends/bronze" - }, + "ingredient": "#forge:small_blends/bronze", "result": { "id": "basemetals:bronze_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_smallpowder.json b/src/generated/resources/data/basemetals/recipe/bronze_smallpowder.json index 5c746b512..9b15c289e 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:bronze_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/bronze" - } + "#forge:dusts/bronze" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/bronze_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/bronze_smallpowder_smelting.json index 0644e915d..23f998e9b 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "tag": "forge:tiny_dusts/bronze" - }, + "ingredient": "#forge:tiny_dusts/bronze", "result": { "id": "basemetals:bronze_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/bronze_stairs.json b/src/generated/resources/data/basemetals/recipe/bronze_stairs.json index 7c32bf1cb..4da79a930 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/bronze" - } + "X": "#forge:storage_blocks/bronze" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_sword.json b/src/generated/resources/data/basemetals/recipe/bronze_sword.json index 9fe0e49f4..68c1a642c 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_sword.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:bronze_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/bronze" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/bronze" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_sword_recycling.json index f47dfe4e0..79ac24382 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_sword" - }, + "ingredient": "basemetals:bronze_sword", "result": { "count": 2, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_trapdoor.json b/src/generated/resources/data/basemetals/recipe/bronze_trapdoor.json index 84c783d04..2fab61a89 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_trapdoor", "key": { - "X": { - "tag": "forge:ingots/bronze" - } + "X": "#forge:ingots/bronze" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_trapdoor_recycling.json index 8a9d32bb1..66c4359f1 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.45, - "ingredient": { - "item": "basemetals:bronze_trapdoor" - }, + "ingredient": "basemetals:bronze_trapdoor", "result": { "count": 4, "id": "basemetals:bronze_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/bronze_wall.json b/src/generated/resources/data/basemetals/recipe/bronze_wall.json index fc5dd7dfa..c48054eac 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_wall.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:bronze_wall", "key": { - "X": { - "tag": "forge:storage_blocks/bronze" - } + "X": "#forge:storage_blocks/bronze" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/bronze_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/bronze_wall_recycling.json index b472e5605..efda69f16 100644 --- a/src/generated/resources/data/basemetals/recipe/bronze_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/bronze_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:bronze_wall" - }, + "ingredient": "basemetals:bronze_wall", "result": { "id": "basemetals:bronze_block" } diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_block.json b/src/generated/resources/data/basemetals/recipe/charcoal_block.json index 76baca0db..de14fd0c6 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_block.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:charcoal_block", "key": { - "X": { - "item": "minecraft:charcoal" - } + "X": "minecraft:charcoal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json index dfe7f7673..feb199bf2 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/charcoal" - }, + "ingredient": "#forge:storage_blocks/charcoal", "result": { "count": 9, "id": "basemetals:charcoal_powder" diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_block_dust.json b/src/generated/resources/data/basemetals/recipe/charcoal_block_dust.json index 61a9c4efe..9d2360adf 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_block_dust.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_block_dust.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:charcoal_block", "key": { - "X": { - "tag": "forge:dusts/charcoal" - } + "X": "#forge:dusts/charcoal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json index 07efc3e51..87390fff7 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:charcoal" - }, + "ingredient": "minecraft:charcoal", "result": { "id": "basemetals:charcoal_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_ingot.json b/src/generated/resources/data/basemetals/recipe/charcoal_ingot.json index 1194e0b37..cb4b9d4d9 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "minecraft:charcoal", "key": { - "X": { - "tag": "forge:nuggets/charcoal" - } + "X": "#forge:nuggets/charcoal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_nugget.json b/src/generated/resources/data/basemetals/recipe/charcoal_nugget.json index d2591fc19..e8766fbd2 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_nugget.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_nugget.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:charcoal_nugget", "ingredients": [ - { - "item": "minecraft:charcoal" - } + "minecraft:charcoal" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json index 823ff73d7..aa48f45ec 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/charcoal" - }, + "ingredient": "#forge:nuggets/charcoal", "result": { "id": "basemetals:charcoal_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/charcoal_powder_from_small.json index dd5085b22..e5d20eaf7 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:charcoal_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/charcoal" - } + "X": "#forge:tiny_dusts/charcoal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/recipe/charcoal_smallpowder.json index 98c4fb661..771429ca4 100644 --- a/src/generated/resources/data/basemetals/recipe/charcoal_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/charcoal_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:charcoal_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/charcoal" - } + "#forge:dusts/charcoal" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json index f1b52942b..97c9fab52 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/coal" - }, + "ingredient": "#forge:storage_blocks/coal", "result": { "count": 9, "id": "basemetals:coal_powder" diff --git a/src/generated/resources/data/basemetals/recipe/coal_block_dust.json b/src/generated/resources/data/basemetals/recipe/coal_block_dust.json index c059bf33b..21afd07dd 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_block_dust.json +++ b/src/generated/resources/data/basemetals/recipe/coal_block_dust.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:coal_block", "key": { - "X": { - "tag": "forge:dusts/coal" - } + "X": "#forge:dusts/coal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coal_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_crushing.json index b0bfcec91..0adcd0837 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:coal" - }, + "ingredient": "minecraft:coal", "result": { "id": "basemetals:coal_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/coal_ingot.json b/src/generated/resources/data/basemetals/recipe/coal_ingot.json index cde7eb75f..2bd705b1e 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/coal_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "minecraft:coal", "key": { - "X": { - "tag": "forge:nuggets/coal" - } + "X": "#forge:nuggets/coal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coal_nugget.json b/src/generated/resources/data/basemetals/recipe/coal_nugget.json index b130b83aa..a185ec05d 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_nugget.json +++ b/src/generated/resources/data/basemetals/recipe/coal_nugget.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coal_nugget", "ingredients": [ - { - "item": "minecraft:coal" - } + "minecraft:coal" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json index 5ab20ec84..c2358cfea 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/coal" - }, + "ingredient": "#forge:nuggets/coal", "result": { "id": "basemetals:coal_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json index e8cf88eed..2c93b279f 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coal_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/coal" - }, + "ingredient": "#forge:ores/coal", "result": { "count": 2, "id": "basemetals:coal_powder" diff --git a/src/generated/resources/data/basemetals/recipe/coal_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/coal_powder_from_small.json index f70b9a196..962b2c4e0 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/coal_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coal_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/coal" - } + "X": "#forge:tiny_dusts/coal" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coal_smallpowder.json b/src/generated/resources/data/basemetals/recipe/coal_smallpowder.json index 54ad71c0d..48136861c 100644 --- a/src/generated/resources/data/basemetals/recipe/coal_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/coal_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coal_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/coal" - } + "#forge:dusts/coal" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json index 62081597d..43ffc7148 100644 --- a/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cobblestone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:cobblestone" - }, + "ingredient": "#forge:cobblestone", "result": { "id": "minecraft:gravel" } diff --git a/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json index b006f3e6f..2d22da045 100644 --- a/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cobblestone_wall_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:cobblestone_wall" - }, + "ingredient": "minecraft:cobblestone_wall", "result": { "id": "minecraft:gravel" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_arrow.json b/src/generated/resources/data/basemetals/recipe/coldiron_arrow.json index bab594a4a..2acc8f532 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:coldiron_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/coldiron" - }, - "R": { - "tag": "forge:rods/coldiron" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/coldiron", + "R": "#forge:rods/coldiron" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_arrow_recycling.json index dae8a9bff..871721572 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:coldiron_arrow" - }, + "ingredient": "basemetals:coldiron_arrow", "result": { "id": "basemetals:coldiron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_axe.json b/src/generated/resources/data/basemetals/recipe/coldiron_axe.json index 5e929dca4..37f18e7f4 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_axe.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/coldiron" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_axe_recycling.json index 37c4cb519..856f3d5ec 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_axe" - }, + "ingredient": "basemetals:coldiron_axe", "result": { "count": 3, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bars.json b/src/generated/resources/data/basemetals/recipe/coldiron_bars.json index dd686655c..807f56bfc 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bars.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_bars", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bars_2.json b/src/generated/resources/data/basemetals/recipe/coldiron_bars_2.json index 3fb1960b5..baa894f80 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_bars", "key": { - "X": { - "tag": "forge:rods/coldiron" - } + "X": "#forge:rods/coldiron" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_bars_recycling.json index f91e1b2e0..f4981b74b 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:coldiron_bars" - }, + "ingredient": "basemetals:coldiron_bars", "result": { "count": 3, "id": "basemetals:coldiron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_block.json b/src/generated/resources/data/basemetals/recipe/coldiron_block.json index b533b60f3..fb5238971 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_block.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_block", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json index 863b9c703..f20fd5731 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/coldiron" - }, + "ingredient": "#forge:storage_blocks/coldiron", "result": { "count": 9, "id": "basemetals:coldiron_powder" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/recipe/coldiron_block_ingot.json index 9a3e779d4..fc423419f 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coldiron_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/coldiron" - } + "#forge:storage_blocks/coldiron" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bolt.json b/src/generated/resources/data/basemetals/recipe/coldiron_bolt.json index ef65cb408..4bc378b1d 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/coldiron" - } + "F": "minecraft:feather", + "R": "#forge:rods/coldiron" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_bolt_recycling.json index 3283fa40c..6e98b76c3 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:coldiron_bolt" - }, + "ingredient": "basemetals:coldiron_bolt", "result": { "count": 2, "id": "basemetals:coldiron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_boots.json b/src/generated/resources/data/basemetals/recipe/coldiron_boots.json index b542aaffa..08e5019d5 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_boots.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:coldiron_boots", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_boots_plate_repair.json index f611d8324..641212271 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/coldiron" - }, + "plate": "#forge:plates/coldiron", "target": "basemetals:coldiron_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_boots_recycling.json index 3058d1b8b..71ebdb33e 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_boots" - }, + "ingredient": "basemetals:coldiron_boots", "result": { "count": 4, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bow.json b/src/generated/resources/data/basemetals/recipe/coldiron_bow.json index 1bf7d2967..140c28dd5 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bow.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_bow", "key": { - "R": { - "tag": "forge:rods/coldiron" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/coldiron", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_bow_recycling.json index cc23b15d1..41ace65be 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_bow" - }, + "ingredient": "basemetals:coldiron_bow", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_button.json b/src/generated/resources/data/basemetals/recipe/coldiron_button.json index e55e52757..afa304031 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_button.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_button", "key": { - "X": { - "tag": "forge:nuggets/coldiron" - } + "X": "#forge:nuggets/coldiron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_button_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_button_recycling.json index f033f01f3..e3d82e517 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:coldiron_button" - }, + "ingredient": "basemetals:coldiron_button", "result": { "count": 2, "id": "basemetals:coldiron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_chestplate.json b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate.json index fd061ca5f..3bc0d3e31 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:coldiron_chestplate", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_plate_repair.json index 64da2c87d..371043d40 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/coldiron" - }, + "plate": "#forge:plates/coldiron", "target": "basemetals:coldiron_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_recycling.json index d37a9f74b..b49363d11 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_chestplate" - }, + "ingredient": "basemetals:coldiron_chestplate", "result": { "count": 8, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer.json index 73b924860..c975386d1 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/coldiron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer_recycling.json index 7d20df8ba..89f8c9174 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:coldiron_crackhammer" - }, + "ingredient": "basemetals:coldiron_crackhammer", "result": { "id": "basemetals:coldiron_block" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_crossbow.json b/src/generated/resources/data/basemetals/recipe/coldiron_crossbow.json index f966eedf0..eab4e38d5 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:coldiron_crossbow", "key": { - "G": { - "tag": "forge:gears/coldiron" - }, - "R": { - "tag": "forge:rods/coldiron" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/coldiron", + "R": "#forge:rods/coldiron", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_crossbow_recycling.json index 1bb5d98ab..6e68c71ea 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_crossbow" - }, + "ingredient": "basemetals:coldiron_crossbow", "result": { "count": 4, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_door.json b/src/generated/resources/data/basemetals/recipe/coldiron_door.json index 48b2663d4..e700b366c 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_door.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_door", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_door_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_door_recycling.json index 64bce29c1..06b2a6f1d 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_door" - }, + "ingredient": "basemetals:coldiron_door", "result": { "count": 2, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/recipe/coldiron_fishingrod.json index 3e863c349..7c3b91839 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_fishing_rod", "key": { - "R": { - "tag": "forge:rods/coldiron" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/coldiron", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_gear.json b/src/generated/resources/data/basemetals/recipe/coldiron_gear.json index b8085e6fd..b12a8a199 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_gear.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:coldiron_gear", "key": { - "R": { - "tag": "forge:rods/coldiron" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "R": "#forge:rods/coldiron", + "X": "#forge:ingots/coldiron" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_gear_recycling.json index 396fa2504..8d25f2c59 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_gear" - }, + "ingredient": "basemetals:coldiron_gear", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_helmet.json b/src/generated/resources/data/basemetals/recipe/coldiron_helmet.json index 07ac2530d..27cae3b22 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:coldiron_helmet", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_helmet_plate_repair.json index b91943570..e0239059f 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/coldiron" - }, + "plate": "#forge:plates/coldiron", "target": "basemetals:coldiron_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_helmet_recycling.json index 9aad0f84f..123c8f7c2 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_helmet" - }, + "ingredient": "basemetals:coldiron_helmet", "result": { "count": 5, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_hoe.json b/src/generated/resources/data/basemetals/recipe/coldiron_hoe.json index d538ea550..8dd8af02b 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/coldiron" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_hoe_recycling.json index 453039bf7..a20f9c24b 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_hoe" - }, + "ingredient": "basemetals:coldiron_hoe", "result": { "count": 2, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/recipe/coldiron_horsearmor.json index 66cf54308..c3e69776c 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/coldiron" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json index f775cd9dd..b5043cf71 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/coldiron" - }, + "ingredient": "#forge:ingots/coldiron", "result": { "id": "basemetals:coldiron_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_from_nuggets.json index 4e215f967..faed6adf8 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coldiron_ingot", "key": { - "X": { - "tag": "forge:nuggets/coldiron" - } + "X": "#forge:nuggets/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_leggings.json b/src/generated/resources/data/basemetals/recipe/coldiron_leggings.json index f14147c10..a5e1127d0 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:coldiron_leggings", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_leggings_plate_repair.json index 57d0df034..8b76d1065 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/coldiron" - }, + "plate": "#forge:plates/coldiron", "target": "basemetals:coldiron_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_leggings_recycling.json index 7a70db595..9f89ee862 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_leggings" - }, + "ingredient": "basemetals:coldiron_leggings", "result": { "count": 7, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_lever.json b/src/generated/resources/data/basemetals/recipe/coldiron_lever.json index a33396a6b..e98052ea3 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_lever.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:coldiron_lever", "key": { - "R": { - "tag": "forge:rods/coldiron" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "R": "#forge:rods/coldiron", + "X": "#forge:ingots/coldiron" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_lever_recycling.json index 943b749a6..674a06cfd 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_lever" - }, + "ingredient": "basemetals:coldiron_lever", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json index 2e19154dd..ad3068098 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/coldiron" - }, + "ingredient": "#forge:nuggets/coldiron", "result": { "id": "basemetals:coldiron_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_nuggets.json b/src/generated/resources/data/basemetals/recipe/coldiron_nuggets.json index d55491a03..4d8de116c 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coldiron_nugget", "ingredients": [ - { - "tag": "forge:ingots/coldiron" - } + "#forge:ingots/coldiron" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_blasting.json index 40029c2cd..bd98be823 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "tag": "forge:ores/coldiron" - }, + "ingredient": "#forge:ores/coldiron", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json index 273d574d0..b08ec69fd 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/coldiron" - }, + "ingredient": "#forge:ores/coldiron", "result": { "count": 2, "id": "basemetals:coldiron_powder" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_ore_smelting.json index ad710a42d..0d730c21c 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:ores/coldiron" - }, + "ingredient": "#forge:ores/coldiron", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe.json index ab4a2ece6..20cfc08b0 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe_recycling.json index 2fcc0900f..2a8c0cd63 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_pickaxe" - }, + "ingredient": "basemetals:coldiron_pickaxe", "result": { "count": 3, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_plate.json b/src/generated/resources/data/basemetals/recipe/coldiron_plate.json index 501361547..07583d6cd 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_plate.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_plate", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_plate_recycling.json index 6680352ef..815705baa 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_plate" - }, + "ingredient": "basemetals:coldiron_plate", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/coldiron_powder_from_small.json index 1dba1b3f3..e67fb7707 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coldiron_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/coldiron" - } + "X": "#forge:tiny_dusts/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_powder_smelting.json index ff79e1486..d7c505223 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:dusts/coldiron" - }, + "ingredient": "#forge:dusts/coldiron", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate.json index 062d0f267..8f38e050f 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate_recycling.json index fd9e1b40e..3ece6e5de 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_pressure_plate" - }, + "ingredient": "basemetals:coldiron_pressure_plate", "result": { "count": 2, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_blasting.json index b1d296c2d..062232f81 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "tag": "forge:raw_materials/coldiron" - }, + "ingredient": "#forge:raw_materials/coldiron", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json index 020d681cd..ce35f09e4 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/coldiron" - }, + "ingredient": "#forge:raw_materials/coldiron", "result": { "id": "basemetals:coldiron_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_raw_smelting.json index c5677453a..54b4d8ac5 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:raw_materials/coldiron" - }, + "ingredient": "#forge:raw_materials/coldiron", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_rod.json b/src/generated/resources/data/basemetals/recipe/coldiron_rod.json index aaa33f5ec..5dd1d0bd3 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_rod.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coldiron_rod", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_rod_recycling.json index 2de2f3a43..946d328e0 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:coldiron_rod" - }, + "ingredient": "basemetals:coldiron_rod", "result": { "count": 4, "id": "basemetals:coldiron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_scythe.json b/src/generated/resources/data/basemetals/recipe/coldiron_scythe.json index a7a8471a1..ad97188fb 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/coldiron" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_shears.json b/src/generated/resources/data/basemetals/recipe/coldiron_shears.json index 13a0fe1be..2e2865cff 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_shears.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:coldiron_shears", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_shears_recycling.json index a8cc06c57..e3a10e388 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_shears" - }, + "ingredient": "basemetals:coldiron_shears", "result": { "count": 2, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_shield.json b/src/generated/resources/data/basemetals/recipe/coldiron_shield.json index 5258d5381..49f299fd2 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_shield.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/coldiron" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/coldiron_shield_plate_repair.json index e81f5b245..5fbc85382 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/coldiron" - }, + "plate": "#forge:plates/coldiron", "target": "basemetals:coldiron_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_shovel.json b/src/generated/resources/data/basemetals/recipe/coldiron_shovel.json index 3d67acb0a..da148cfac 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/coldiron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_shovel_recycling.json index 0917fae8b..894a74fb7 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_shovel" - }, + "ingredient": "basemetals:coldiron_shovel", "result": { "id": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_slab.json b/src/generated/resources/data/basemetals/recipe/coldiron_slab.json index 8ff8db78e..7860b8e67 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_slab.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_slab", "key": { - "X": { - "tag": "forge:storage_blocks/coldiron" - } + "X": "#forge:storage_blocks/coldiron" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_slab_recycling.json index ddabc136f..0afc9600a 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:coldiron_slab" - }, + "ingredient": "basemetals:coldiron_slab", "result": { "count": 4, "id": "basemetals:coldiron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder.json index cf68a88fc..42b561c36 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:coldiron_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/coldiron" - } + "#forge:dusts/coldiron" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder_smelting.json index a036c0507..aff165556 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "tag": "forge:tiny_dusts/coldiron" - }, + "ingredient": "#forge:tiny_dusts/coldiron", "result": { "id": "basemetals:coldiron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_stairs.json b/src/generated/resources/data/basemetals/recipe/coldiron_stairs.json index b98686f60..1d8382f5c 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/coldiron" - } + "X": "#forge:storage_blocks/coldiron" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_sword.json b/src/generated/resources/data/basemetals/recipe/coldiron_sword.json index b3ad4aca1..6310c84e4 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_sword.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:coldiron_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/coldiron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/coldiron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_sword_recycling.json index 1995f6a53..6988cb078 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_sword" - }, + "ingredient": "basemetals:coldiron_sword", "result": { "count": 2, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor.json index 68adabc63..a0f73e241 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_trapdoor", "key": { - "X": { - "tag": "forge:ingots/coldiron" - } + "X": "#forge:ingots/coldiron" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor_recycling.json index ef472a12b..4aba3d429 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:coldiron_trapdoor" - }, + "ingredient": "basemetals:coldiron_trapdoor", "result": { "count": 4, "id": "basemetals:coldiron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_wall.json b/src/generated/resources/data/basemetals/recipe/coldiron_wall.json index 385aa64f3..d2804bda8 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_wall.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:coldiron_wall", "key": { - "X": { - "tag": "forge:storage_blocks/coldiron" - } + "X": "#forge:storage_blocks/coldiron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/coldiron_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/coldiron_wall_recycling.json index 81941981a..8996d5184 100644 --- a/src/generated/resources/data/basemetals/recipe/coldiron_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/coldiron_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:coldiron_wall" - }, + "ingredient": "basemetals:coldiron_wall", "result": { "id": "basemetals:coldiron_block" } diff --git a/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_gold_cast.json index 49662100c..4253de09e 100644 --- a/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_gold_cast.json @@ -22,6 +22,6 @@ ] }, "result": { - "item": "basemetals:copper_nugget" + "item": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_sand_cast.json index bda7e767b..a279f5da6 100644 --- a/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipe/compat/tconstruct/casting/copper/nugget_sand_cast.json @@ -23,6 +23,6 @@ ] }, "result": { - "item": "basemetals:copper_nugget" + "item": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_arrow.json b/src/generated/resources/data/basemetals/recipe/copper_arrow.json index aeb80fbcb..c0412d28b 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/copper_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:copper_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/copper" - }, - "R": { - "tag": "forge:rods/copper" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/copper", + "R": "#forge:rods/copper" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/copper_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_arrow_recycling.json index 8e9b0784d..3f7463adc 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_arrow_recycling.json @@ -2,10 +2,8 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "item": "basemetals:copper_arrow" - }, + "ingredient": "basemetals:copper_arrow", "result": { - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_axe.json b/src/generated/resources/data/basemetals/recipe/copper_axe.json index c811aeb21..190b6f113 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_axe.json +++ b/src/generated/resources/data/basemetals/recipe/copper_axe.json @@ -2,15 +2,11 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_axe", + "category": "misc", + "group": "minecraft:copper_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/copper" }, "pattern": [ "XX", @@ -18,7 +14,7 @@ " S" ], "result": { - "id": "basemetals:copper_axe" + "id": "minecraft:copper_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json index 3fa1cc920..ed26a7099 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_axe" - }, + "ingredient": "#forge:tools/axes/copper", "result": { "count": 3, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_bars.json b/src/generated/resources/data/basemetals/recipe/copper_bars.json index cf88d2057..996ef04b0 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bars.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bars.json @@ -3,11 +3,9 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_bars", + "group": "minecraft:copper_bars", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XXX", @@ -15,7 +13,7 @@ ], "result": { "count": 16, - "id": "basemetals:copper_bars" + "id": "minecraft:copper_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_bars_2.json b/src/generated/resources/data/basemetals/recipe/copper_bars_2.json index 3e5fed29c..84689cb3b 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bars_2.json @@ -3,18 +3,16 @@ "recipe": { "type": "minecraft:crafting_shaped", "category": "building", - "group": "basemetals:copper_bars", + "group": "minecraft:copper_bars", "key": { - "X": { - "tag": "forge:rods/copper" - } + "X": "#forge:rods/copper" }, "pattern": [ "XXX" ], "result": { "count": 4, - "id": "basemetals:copper_bars" + "id": "minecraft:copper_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_bars_recycling.json index 5a28d1662..69e64025c 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bars_recycling.json @@ -2,11 +2,9 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "item": "basemetals:copper_bars" - }, + "ingredient": "#forge:bars/copper", "result": { "count": 3, - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_block.json b/src/generated/resources/data/basemetals/recipe/copper_block.json index a4a04771c..e5fd175e6 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_block.json +++ b/src/generated/resources/data/basemetals/recipe/copper_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:copper_block", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json index b61ba00e2..a9d63c13d 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/copper" - }, + "ingredient": "#forge:storage_blocks/copper", "result": { "count": 9, "id": "basemetals:copper_powder" diff --git a/src/generated/resources/data/basemetals/recipe/copper_block_ingot.json b/src/generated/resources/data/basemetals/recipe/copper_block_ingot.json index 4ded1be8d..374a1768c 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/copper_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "minecraft:copper_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/copper" - } + "#forge:storage_blocks/copper" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/copper_bolt.json b/src/generated/resources/data/basemetals/recipe/copper_bolt.json index 7a9a7aa40..33b014bb7 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:copper_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/copper" - } + "F": "minecraft:feather", + "R": "#forge:rods/copper" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/copper_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_bolt_recycling.json index 6ede92691..ad9721dd0 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bolt_recycling.json @@ -2,11 +2,9 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "item": "basemetals:copper_bolt" - }, + "ingredient": "basemetals:copper_bolt", "result": { "count": 2, - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_boots.json b/src/generated/resources/data/basemetals/recipe/copper_boots.json index ee5bd2067..5976b4faf 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_boots.json +++ b/src/generated/resources/data/basemetals/recipe/copper_boots.json @@ -2,19 +2,17 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_boots", + "category": "misc", + "group": "minecraft:copper_boots", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "X X", "X X" ], "result": { - "id": "basemetals:copper_boots" + "id": "minecraft:copper_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_boots_plate_repair.json index d5e968e91..69132d6a2 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/copper_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/copper" - }, + "plate": "#forge:plates/copper", "target": "basemetals:copper_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json index 41721eae8..f9c76597b 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_boots" - }, + "ingredient": "#forge:armors/boots/copper", "result": { "count": 4, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_bow.json b/src/generated/resources/data/basemetals/recipe/copper_bow.json index 9ce76fbb8..1f5e9ec18 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bow.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:copper_bow", "key": { - "R": { - "tag": "forge:rods/copper" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/copper", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json index 33b5f1264..4ced08ad9 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_bow" - }, + "ingredient": "basemetals:copper_bow", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_button.json b/src/generated/resources/data/basemetals/recipe/copper_button.json index 6aaac0dce..8fd046b94 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_button.json +++ b/src/generated/resources/data/basemetals/recipe/copper_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:copper_button", "key": { - "X": { - "tag": "forge:nuggets/copper" - } + "X": "#forge:nuggets/copper" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/copper_button_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_button_recycling.json index de0ceec67..55df36b58 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_button_recycling.json @@ -2,11 +2,9 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "item": "basemetals:copper_button" - }, + "ingredient": "basemetals:copper_button", "result": { "count": 2, - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_chestplate.json b/src/generated/resources/data/basemetals/recipe/copper_chestplate.json index 0c605ff71..4fd6776bd 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/copper_chestplate.json @@ -2,12 +2,10 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_chestplate", + "category": "misc", + "group": "minecraft:copper_chestplate", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "X X", @@ -15,7 +13,7 @@ "XXX" ], "result": { - "id": "basemetals:copper_chestplate" + "id": "minecraft:copper_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_chestplate_plate_repair.json index 3cf321310..6e8e6a7b5 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/copper_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/copper" - }, + "plate": "#forge:plates/copper", "target": "basemetals:copper_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json index adf20fd6a..11f3220e7 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_chestplate" - }, + "ingredient": "#forge:armors/chestplates/copper", "result": { "count": 8, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_crackhammer.json b/src/generated/resources/data/basemetals/recipe/copper_crackhammer.json index dfeb5d840..75e57991f 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/copper_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:copper_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/copper" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json index 7ef0cc465..e68e5f744 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:copper_crackhammer" - }, + "ingredient": "basemetals:copper_crackhammer", "result": { "id": "minecraft:copper_block" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_crossbow.json b/src/generated/resources/data/basemetals/recipe/copper_crossbow.json index fa46472c2..e86b55009 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/copper_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:copper_crossbow", "key": { - "G": { - "tag": "forge:gears/copper" - }, - "R": { - "tag": "forge:rods/copper" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/copper", + "R": "#forge:rods/copper", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json index 0561305b6..0588d4ef7 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_crossbow" - }, + "ingredient": "basemetals:copper_crossbow", "result": { "count": 4, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_door.json b/src/generated/resources/data/basemetals/recipe/copper_door.json index 829a37158..7aa2d5648 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_door.json +++ b/src/generated/resources/data/basemetals/recipe/copper_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:copper_door", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_door_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_door_recycling.json index 5834f5548..2e3fde604 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "tag": "forge:doors/copper" - }, + "ingredient": "#forge:doors/copper", "result": { "count": 2, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_fishingrod.json b/src/generated/resources/data/basemetals/recipe/copper_fishingrod.json index 328b0cff8..10b3fc265 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/copper_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:copper_fishing_rod", "key": { - "R": { - "tag": "forge:rods/copper" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/copper", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/copper_gear.json b/src/generated/resources/data/basemetals/recipe/copper_gear.json index b01baf1dd..366ad52b9 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_gear.json +++ b/src/generated/resources/data/basemetals/recipe/copper_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:copper_gear", "key": { - "R": { - "tag": "forge:rods/copper" - }, - "X": { - "tag": "forge:ingots/copper" - } + "R": "#forge:rods/copper", + "X": "#forge:ingots/copper" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json index dea2a988d..89dfb1da1 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_gear" - }, + "ingredient": "basemetals:copper_gear", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_helmet.json b/src/generated/resources/data/basemetals/recipe/copper_helmet.json index 35b74d5d9..fd8181ee1 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/copper_helmet.json @@ -2,19 +2,17 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_helmet", + "category": "misc", + "group": "minecraft:copper_helmet", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XXX", "X X" ], "result": { - "id": "basemetals:copper_helmet" + "id": "minecraft:copper_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_helmet_plate_repair.json index ec3d7166f..76d0166ff 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/copper_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/copper" - }, + "plate": "#forge:plates/copper", "target": "basemetals:copper_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json index 27160ca67..1ff537266 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_helmet" - }, + "ingredient": "#forge:armors/helmets/copper", "result": { "count": 5, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_hoe.json b/src/generated/resources/data/basemetals/recipe/copper_hoe.json index cff971281..4ec347386 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/copper_hoe.json @@ -2,15 +2,11 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_hoe", + "category": "misc", + "group": "minecraft:copper_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/copper" }, "pattern": [ "XX", @@ -18,7 +14,7 @@ " S" ], "result": { - "id": "basemetals:copper_hoe" + "id": "minecraft:copper_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json index 37660d606..4ee993efe 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_hoe" - }, + "ingredient": "#forge:tools/hoes/copper", "result": { "count": 2, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_horsearmor.json b/src/generated/resources/data/basemetals/recipe/copper_horsearmor.json index a1a0a9b94..d950d778a 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/copper_horsearmor.json @@ -2,15 +2,11 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_horse_armor", + "category": "misc", + "group": "minecraft:copper_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/copper" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/copper" }, "pattern": [ " X", @@ -18,7 +14,7 @@ "XXX" ], "result": { - "id": "basemetals:copper_horse_armor" + "id": "minecraft:copper_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json index 4df5fb99c..6ec9158e1 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/copper" - }, + "ingredient": "#forge:ingots/copper", "result": { "id": "basemetals:copper_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json index aef3e87ca..486b242e6 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "minecraft:copper_ingot", "key": { - "X": { - "item": "basemetals:copper_nugget" - } + "X": "#forge:nuggets/copper" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_leggings.json b/src/generated/resources/data/basemetals/recipe/copper_leggings.json index 1ee288296..53b6a6363 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/copper_leggings.json @@ -2,12 +2,10 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_leggings", + "category": "misc", + "group": "minecraft:copper_leggings", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XXX", @@ -15,7 +13,7 @@ "X X" ], "result": { - "id": "basemetals:copper_leggings" + "id": "minecraft:copper_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_leggings_plate_repair.json index 8beacdb1f..58fad7f2e 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/copper_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/copper" - }, + "plate": "#forge:plates/copper", "target": "basemetals:copper_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json index d95414666..eba91ce71 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_leggings" - }, + "ingredient": "#forge:armors/leggings/copper", "result": { "count": 7, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_lever.json b/src/generated/resources/data/basemetals/recipe/copper_lever.json index ab97166e7..9f3a52c5e 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_lever.json +++ b/src/generated/resources/data/basemetals/recipe/copper_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:copper_lever", "key": { - "R": { - "tag": "forge:rods/copper" - }, - "X": { - "tag": "forge:ingots/copper" - } + "R": "#forge:rods/copper", + "X": "#forge:ingots/copper" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json index 93e330861..bc71b74a5 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_lever" - }, + "ingredient": "basemetals:copper_lever", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json index 019042fc8..1f650f1e1 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/copper" - }, + "ingredient": "#forge:nuggets/copper", "result": { "id": "basemetals:copper_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_nuggets.json b/src/generated/resources/data/basemetals/recipe/copper_nuggets.json index 9c63a394b..722fb23de 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/copper_nuggets.json @@ -3,15 +3,13 @@ "recipe": { "type": "minecraft:crafting_shapeless", "category": "misc", - "group": "basemetals:copper_nugget", + "group": "minecraft:copper_nugget", "ingredients": [ - { - "tag": "forge:ingots/copper" - } + "#forge:ingots/copper" ], "result": { "count": 9, - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json index 8a7430f4b..8f915c320 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.5, - "ingredient": { - "tag": "forge:ores/copper" - }, + "ingredient": "#forge:ores/copper", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json index 01142db84..31ebd6220 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/copper" - }, + "ingredient": "#forge:ores/copper", "result": { "count": 2, "id": "basemetals:copper_powder" diff --git a/src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json index 1818aeb3b..9a5c9b812 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "tag": "forge:ores/copper" - }, + "ingredient": "#forge:ores/copper", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_pickaxe.json b/src/generated/resources/data/basemetals/recipe/copper_pickaxe.json index d76619ae3..a30da1726 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/copper_pickaxe.json @@ -2,15 +2,11 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_pickaxe", + "category": "misc", + "group": "minecraft:copper_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/copper" }, "pattern": [ "XXX", @@ -18,7 +14,7 @@ " S " ], "result": { - "id": "basemetals:copper_pickaxe" + "id": "minecraft:copper_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json index d8ca7590c..77f8c3239 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_pickaxe" - }, + "ingredient": "#forge:tools/pickaxes/copper", "result": { "count": 3, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_plate.json b/src/generated/resources/data/basemetals/recipe/copper_plate.json index de2315ebe..2658426ee 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_plate.json +++ b/src/generated/resources/data/basemetals/recipe/copper_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:copper_plate", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json index 16f4c45d8..0203bb95c 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_plate" - }, + "ingredient": "basemetals:copper_plate", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/copper_powder_from_small.json index fa331ec05..0825fab38 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/copper_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:copper_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/copper" - } + "X": "#forge:tiny_dusts/copper" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json index 9fd144626..5ca245cfd 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "tag": "forge:dusts/copper" - }, + "ingredient": "#forge:dusts/copper", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate.json index 75a80a8bc..499ed5e43 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:copper_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json index ce9ab2282..c77902e19 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_pressure_plate" - }, + "ingredient": "basemetals:copper_pressure_plate", "result": { "count": 2, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json index ebc7edfb1..22b0cb277 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/copper_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/copper" - }, + "ingredient": "#forge:raw_materials/copper", "result": { "id": "basemetals:copper_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_rod.json b/src/generated/resources/data/basemetals/recipe/copper_rod.json index de4ea3f4d..e490f7864 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_rod.json +++ b/src/generated/resources/data/basemetals/recipe/copper_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:copper_rod", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/copper_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_rod_recycling.json index 3217c5aa9..1fdbf7d4a 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_rod_recycling.json @@ -2,11 +2,9 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "item": "basemetals:copper_rod" - }, + "ingredient": "basemetals:copper_rod", "result": { "count": 4, - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_scythe.json b/src/generated/resources/data/basemetals/recipe/copper_scythe.json index 6563eee1d..f4394be9a 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/copper_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:copper_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/copper" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/copper_shears.json b/src/generated/resources/data/basemetals/recipe/copper_shears.json index d3cfff20c..2211b5232 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_shears.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:copper_shears", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json index 67888fff5..d1510ba3a 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_shears" - }, + "ingredient": "basemetals:copper_shears", "result": { "count": 2, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_shield.json b/src/generated/resources/data/basemetals/recipe/copper_shield.json index 168211a1f..b461d4055 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_shield.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:copper_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/copper" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/copper" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/copper_shield_plate_repair.json index 2a95ae610..fb0f75a82 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/copper" - }, + "plate": "#forge:plates/copper", "target": "basemetals:copper_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_shovel.json b/src/generated/resources/data/basemetals/recipe/copper_shovel.json index 6e9d9218c..97b4113b5 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shovel.json @@ -2,15 +2,11 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_shovel", + "category": "misc", + "group": "minecraft:copper_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/copper" }, "pattern": [ "X", @@ -18,7 +14,7 @@ "S" ], "result": { - "id": "basemetals:copper_shovel" + "id": "minecraft:copper_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json index a5d6827c9..663d13228 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_shovel" - }, + "ingredient": "#forge:tools/shovels/copper", "result": { "id": "minecraft:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/copper_slab.json b/src/generated/resources/data/basemetals/recipe/copper_slab.json index e0a6899af..272af824d 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_slab.json +++ b/src/generated/resources/data/basemetals/recipe/copper_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:cut_copper_slab", "key": { - "X": { - "tag": "forge:storage_blocks/copper" - } + "X": "#forge:storage_blocks/copper" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json index eb69d0114..60ab856eb 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_slab_recycling.json @@ -2,11 +2,9 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "tag": "forge:slabs/copper" - }, + "ingredient": "#forge:slabs/copper", "result": { "count": 4, - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_smallpowder.json b/src/generated/resources/data/basemetals/recipe/copper_smallpowder.json index 55d0d3299..848efa49c 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/copper_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:copper_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/copper" - } + "#forge:dusts/copper" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/copper_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/copper_smallpowder_smelting.json index 4ea8ba9bc..53d58f2c6 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/copper_smallpowder_smelting.json @@ -2,10 +2,8 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.06, - "ingredient": { - "tag": "forge:tiny_dusts/copper" - }, + "ingredient": "#forge:tiny_dusts/copper", "result": { - "id": "basemetals:copper_nugget" + "id": "minecraft:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_stairs.json b/src/generated/resources/data/basemetals/recipe/copper_stairs.json index e4a282782..be59e6dd3 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/copper_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:cut_copper_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/copper" - } + "X": "#forge:storage_blocks/copper" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/copper_sword.json b/src/generated/resources/data/basemetals/recipe/copper_sword.json index bd52670db..ea3395b46 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_sword.json +++ b/src/generated/resources/data/basemetals/recipe/copper_sword.json @@ -2,15 +2,11 @@ "type": "basemetals:content_crafting", "recipe": { "type": "minecraft:crafting_shaped", - "category": "equipment", - "group": "basemetals:copper_sword", + "category": "misc", + "group": "minecraft:copper_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/copper" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/copper" }, "pattern": [ "X", @@ -18,7 +14,7 @@ "S" ], "result": { - "id": "basemetals:copper_sword" + "id": "minecraft:copper_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json index e65a0e265..5b7d8092d 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_sword" - }, + "ingredient": "#forge:tools/swords/copper", "result": { "count": 2, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_trapdoor.json b/src/generated/resources/data/basemetals/recipe/copper_trapdoor.json index 0fddc5194..fb46bad31 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/copper_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:copper_trapdoor", "key": { - "X": { - "tag": "forge:ingots/copper" - } + "X": "#forge:ingots/copper" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json index 645e52afb..fe78dad83 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "basemetals:copper_trapdoor" - }, + "ingredient": "basemetals:copper_trapdoor", "result": { "count": 4, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/copper_wall.json b/src/generated/resources/data/basemetals/recipe/copper_wall.json index c464b1f70..481775f31 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_wall.json +++ b/src/generated/resources/data/basemetals/recipe/copper_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:copper_wall", "key": { - "X": { - "tag": "forge:storage_blocks/copper" - } + "X": "#forge:storage_blocks/copper" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json index b72e41cfb..2f29c0d3f 100644 --- a/src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/copper_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:copper_wall" - }, + "ingredient": "basemetals:copper_wall", "result": { "id": "minecraft:copper_block" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_arrow.json b/src/generated/resources/data/basemetals/recipe/cupronickel_arrow.json index 38275c790..c68ed094c 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:cupronickel_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/cupronickel" - }, - "R": { - "tag": "forge:rods/cupronickel" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/cupronickel", + "R": "#forge:rods/cupronickel" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_arrow_recycling.json index b1d648acb..9e325e9f0 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:cupronickel_arrow" - }, + "ingredient": "basemetals:cupronickel_arrow", "result": { "id": "basemetals:cupronickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_axe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_axe.json index 1361a7f92..52116fe3b 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_axe.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_axe_recycling.json index 212eb3e9d..fc8c97c2f 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_axe" - }, + "ingredient": "basemetals:cupronickel_axe", "result": { "count": 3, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bars.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bars.json index e49b0b62c..85abe076c 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bars.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_bars", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bars_2.json index 7801ac298..029018897 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_bars", "key": { - "X": { - "tag": "forge:rods/cupronickel" - } + "X": "#forge:rods/cupronickel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bars_recycling.json index 18f3b94b9..8fafc7a6d 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:cupronickel_bars" - }, + "ingredient": "basemetals:cupronickel_bars", "result": { "count": 3, "id": "basemetals:cupronickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_blend.json b/src/generated/resources/data/basemetals/recipe/cupronickel_blend.json index 116001223..afa43b935 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_blend.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_blend.json @@ -5,18 +5,10 @@ "category": "misc", "group": "basemetals:cupronickel_blend", "ingredients": [ - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/nickel" - } + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/copper", + "#forge:dusts/nickel" ], "result": { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/cupronickel_blend_from_small.json index 625181828..410c240cc 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_blend", "key": { - "X": { - "tag": "forge:small_blends/cupronickel" - } + "X": "#forge:small_blends/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_blend_smelting.json index edbc68673..6e71c00ce 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "tag": "forge:blends/cupronickel" - }, + "ingredient": "#forge:blends/cupronickel", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_block.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block.json index c7b038559..7a8b9ac89 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_block.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_block", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json index 3b7ced3eb..1959769b3 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/cupronickel" - }, + "ingredient": "#forge:storage_blocks/cupronickel", "result": { "count": 9, "id": "basemetals:cupronickel_powder" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/cupronickel_block_ingot.json index c131bf1aa..5a5c90221 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/cupronickel" - } + "#forge:storage_blocks/cupronickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bolt.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bolt.json index de0e5779d..53d55e14c 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/cupronickel" - } + "F": "minecraft:feather", + "R": "#forge:rods/cupronickel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bolt_recycling.json index a6d050f3c..9eefc8581 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:cupronickel_bolt" - }, + "ingredient": "basemetals:cupronickel_bolt", "result": { "count": 2, "id": "basemetals:cupronickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_boots.json b/src/generated/resources/data/basemetals/recipe/cupronickel_boots.json index 455e9d0a7..f950e92e4 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_boots.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:cupronickel_boots", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_boots_plate_repair.json index 47cbdfe38..a00d53c57 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/cupronickel" - }, + "plate": "#forge:plates/cupronickel", "target": "basemetals:cupronickel_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_boots_recycling.json index a3f1b5396..612e57860 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_boots" - }, + "ingredient": "basemetals:cupronickel_boots", "result": { "count": 4, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bow.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bow.json index 61be74be5..a0125aea0 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bow.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_bow", "key": { - "R": { - "tag": "forge:rods/cupronickel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/cupronickel", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_bow_recycling.json index 44dc1320f..82f968209 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_bow" - }, + "ingredient": "basemetals:cupronickel_bow", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_button.json b/src/generated/resources/data/basemetals/recipe/cupronickel_button.json index e6cfaf279..13039e987 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_button.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_button", "key": { - "X": { - "tag": "forge:nuggets/cupronickel" - } + "X": "#forge:nuggets/cupronickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_button_recycling.json index 64dd9b3db..197aee640 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:cupronickel_button" - }, + "ingredient": "basemetals:cupronickel_button", "result": { "count": 2, "id": "basemetals:cupronickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate.json index ba67b90c2..e4629b1d3 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:cupronickel_chestplate", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_plate_repair.json index 85575538c..6cc62d868 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/cupronickel" - }, + "plate": "#forge:plates/cupronickel", "target": "basemetals:cupronickel_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_recycling.json index a8a498055..1fb6768a2 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_chestplate" - }, + "ingredient": "basemetals:cupronickel_chestplate", "result": { "count": 8, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer.json index 7abd885d1..ecc5fc0bc 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/cupronickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer_recycling.json index f2b0a66ef..255551995 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:cupronickel_crackhammer" - }, + "ingredient": "basemetals:cupronickel_crackhammer", "result": { "id": "basemetals:cupronickel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow.json index 20f729dc1..d9341b954 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:cupronickel_crossbow", "key": { - "G": { - "tag": "forge:gears/cupronickel" - }, - "R": { - "tag": "forge:rods/cupronickel" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/cupronickel", + "R": "#forge:rods/cupronickel", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow_recycling.json index d15d6256d..3d82faf41 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_crossbow" - }, + "ingredient": "basemetals:cupronickel_crossbow", "result": { "count": 4, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_door.json b/src/generated/resources/data/basemetals/recipe/cupronickel_door.json index 32f86b9b4..31c07fe33 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_door.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_door", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_door_recycling.json index ee49a00e1..d384102e1 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_door" - }, + "ingredient": "basemetals:cupronickel_door", "result": { "count": 2, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/cupronickel_fishingrod.json index 2d68baa6e..141f33da5 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_fishing_rod", "key": { - "R": { - "tag": "forge:rods/cupronickel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/cupronickel", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_gear.json b/src/generated/resources/data/basemetals/recipe/cupronickel_gear.json index d4c36b18c..13bec2fd7 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_gear.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:cupronickel_gear", "key": { - "R": { - "tag": "forge:rods/cupronickel" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "R": "#forge:rods/cupronickel", + "X": "#forge:ingots/cupronickel" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_gear_recycling.json index 9d22051e8..869c54780 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_gear" - }, + "ingredient": "basemetals:cupronickel_gear", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_helmet.json b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet.json index 1a5b30563..6838d01b1 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:cupronickel_helmet", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_plate_repair.json index 8aa780c33..fe9dae684 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/cupronickel" - }, + "plate": "#forge:plates/cupronickel", "target": "basemetals:cupronickel_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_recycling.json index 61319f181..e30052abd 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_helmet" - }, + "ingredient": "basemetals:cupronickel_helmet", "result": { "count": 5, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_hoe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_hoe.json index 2212657b1..edc666f21 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_hoe_recycling.json index e1c31c5ea..f5abd05eb 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_hoe" - }, + "ingredient": "basemetals:cupronickel_hoe", "result": { "count": 2, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/cupronickel_horsearmor.json index b236f46fd..dde1f6f47 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/cupronickel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json index 3148e0b51..02b1d4ec3 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/cupronickel" - }, + "ingredient": "#forge:ingots/cupronickel", "result": { "id": "basemetals:cupronickel_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_from_nuggets.json index d608b23b8..db81a41bc 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_ingot", "key": { - "X": { - "tag": "forge:nuggets/cupronickel" - } + "X": "#forge:nuggets/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_leggings.json b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings.json index 8b4201a35..837226fb1 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:cupronickel_leggings", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_plate_repair.json index 3ed996ead..95e74027a 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/cupronickel" - }, + "plate": "#forge:plates/cupronickel", "target": "basemetals:cupronickel_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_recycling.json index bbd5dc0b8..a498c983c 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_leggings" - }, + "ingredient": "basemetals:cupronickel_leggings", "result": { "count": 7, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_lever.json b/src/generated/resources/data/basemetals/recipe/cupronickel_lever.json index 9af5b6aea..79082814f 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_lever.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:cupronickel_lever", "key": { - "R": { - "tag": "forge:rods/cupronickel" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "R": "#forge:rods/cupronickel", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_lever_recycling.json index 6dd3033ae..c106a58f2 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_lever" - }, + "ingredient": "basemetals:cupronickel_lever", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json index ffb8014a3..09509e4c0 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/cupronickel" - }, + "ingredient": "#forge:nuggets/cupronickel", "result": { "id": "basemetals:cupronickel_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/recipe/cupronickel_nuggets.json index 8feca4c84..2f28e9a1a 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_nugget", "ingredients": [ - { - "tag": "forge:ingots/cupronickel" - } + "#forge:ingots/cupronickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe.json index 4d5e7ade3..78571473d 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe_recycling.json index 182ebfd72..8efd0471b 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_pickaxe" - }, + "ingredient": "basemetals:cupronickel_pickaxe", "result": { "count": 3, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_plate.json b/src/generated/resources/data/basemetals/recipe/cupronickel_plate.json index af63bc3a5..38119b644 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_plate.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_plate", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_plate_recycling.json index af477753c..eaa5bb991 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_plate" - }, + "ingredient": "basemetals:cupronickel_plate", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/cupronickel_powder_from_small.json index b1a3390f3..5c89cb7c9 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/cupronickel" - } + "X": "#forge:tiny_dusts/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_powder_smelting.json index 540427b67..9a12866a7 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "tag": "forge:dusts/cupronickel" - }, + "ingredient": "#forge:dusts/cupronickel", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate.json index 5a997808c..3a4ef9751 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate_recycling.json index 40b99f58f..bf4fae1da 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_pressure_plate" - }, + "ingredient": "basemetals:cupronickel_pressure_plate", "result": { "count": 2, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_rod.json b/src/generated/resources/data/basemetals/recipe/cupronickel_rod.json index eafacb444..b7332bdc7 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_rod.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_rod", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_rod_recycling.json index 3f66d82f3..9fb0a6194 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:cupronickel_rod" - }, + "ingredient": "basemetals:cupronickel_rod", "result": { "count": 4, "id": "basemetals:cupronickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_scythe.json b/src/generated/resources/data/basemetals/recipe/cupronickel_scythe.json index 31bc23646..0c3a16842 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_shears.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shears.json index 89f2615c0..33872fda7 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_shears.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:cupronickel_shears", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shears_recycling.json index ccef194f5..972a1d72f 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_shears" - }, + "ingredient": "basemetals:cupronickel_shears", "result": { "count": 2, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_shield.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shield.json index dcbc36b12..d027e6f86 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_shield.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shield_plate_repair.json index 7447b87b1..94df7451d 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/cupronickel" - }, + "plate": "#forge:plates/cupronickel", "target": "basemetals:cupronickel_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_shovel.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shovel.json index 806df8807..2834b0afb 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_shovel_recycling.json index f19b553c3..bb1213000 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_shovel" - }, + "ingredient": "basemetals:cupronickel_shovel", "result": { "id": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_slab.json b/src/generated/resources/data/basemetals/recipe/cupronickel_slab.json index 5c6210479..51ab50ffd 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_slab.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_slab", "key": { - "X": { - "tag": "forge:storage_blocks/cupronickel" - } + "X": "#forge:storage_blocks/cupronickel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_slab_recycling.json index e04990399..bee88d2b0 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:cupronickel_slab" - }, + "ingredient": "basemetals:cupronickel_slab", "result": { "count": 4, "id": "basemetals:cupronickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend.json index 032e1fa8b..44dfc8461 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_smallblend", "ingredients": [ - { - "tag": "forge:blends/cupronickel" - } + "#forge:blends/cupronickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend_smelting.json index 5e8f95cea..323e32584 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "tag": "forge:small_blends/cupronickel" - }, + "ingredient": "#forge:small_blends/cupronickel", "result": { "id": "basemetals:cupronickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder.json index 85fe0f79b..3927412d6 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:cupronickel_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/cupronickel" - } + "#forge:dusts/cupronickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder_smelting.json index 0b7c9eccb..7a6c87d90 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "tag": "forge:tiny_dusts/cupronickel" - }, + "ingredient": "#forge:tiny_dusts/cupronickel", "result": { "id": "basemetals:cupronickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_stairs.json b/src/generated/resources/data/basemetals/recipe/cupronickel_stairs.json index 89ce730c6..7ebda3533 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/cupronickel" - } + "X": "#forge:storage_blocks/cupronickel" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_sword.json b/src/generated/resources/data/basemetals/recipe/cupronickel_sword.json index 8878e7493..14d669a00 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_sword.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:cupronickel_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/cupronickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/cupronickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_sword_recycling.json index 08c871b7c..46e7dd178 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_sword" - }, + "ingredient": "basemetals:cupronickel_sword", "result": { "count": 2, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor.json index c282f5751..58fa04366 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_trapdoor", "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } + "X": "#forge:ingots/cupronickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor_recycling.json index f5db025bc..8f8e0057d 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:cupronickel_trapdoor" - }, + "ingredient": "basemetals:cupronickel_trapdoor", "result": { "count": 4, "id": "basemetals:cupronickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_wall.json b/src/generated/resources/data/basemetals/recipe/cupronickel_wall.json index 8e97835c6..ee2d398fe 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_wall.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:cupronickel_wall", "key": { - "X": { - "tag": "forge:storage_blocks/cupronickel" - } + "X": "#forge:storage_blocks/cupronickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/cupronickel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/cupronickel_wall_recycling.json index dadf6d53d..50105863a 100644 --- a/src/generated/resources/data/basemetals/recipe/cupronickel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/cupronickel_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:cupronickel_wall" - }, + "ingredient": "basemetals:cupronickel_wall", "result": { "id": "basemetals:cupronickel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json b/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json index 627ff36d5..ab664dc7d 100644 --- a/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/dark_prismarine_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:dark_prismarine" - }, + "ingredient": "minecraft:dark_prismarine", "result": { "count": 8, "id": "minecraft:prismarine_shard" diff --git a/src/generated/resources/data/basemetals/recipe/detector_rail.json b/src/generated/resources/data/basemetals/recipe/detector_rail.json index 0f1398d1f..b2168a829 100644 --- a/src/generated/resources/data/basemetals/recipe/detector_rail.json +++ b/src/generated/resources/data/basemetals/recipe/detector_rail.json @@ -5,15 +5,9 @@ "category": "building", "group": "minecraft:detector_rail", "key": { - "R": { - "item": "minecraft:redstone_torch" - }, - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "R": "minecraft:redstone_torch", + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_arrow.json b/src/generated/resources/data/basemetals/recipe/diamond_arrow.json index 0fa33d8ed..ddb0c2501 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:diamond_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/diamond" - }, - "R": { - "tag": "forge:rods/diamond" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/diamond", + "R": "#forge:rods/diamond" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_arrow_recycling.json index d079d8c9a..2908b3c44 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:diamond_arrow" - }, + "ingredient": "basemetals:diamond_arrow", "result": { "id": "basemetals:diamond_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bars.json b/src/generated/resources/data/basemetals/recipe/diamond_bars.json index f9ed129f2..efbefff76 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bars.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_bars", "key": { - "X": { - "tag": "forge:gems/diamond" - } + "X": "#forge:gems/diamond" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bars_2.json b/src/generated/resources/data/basemetals/recipe/diamond_bars_2.json index ae795ddf9..846c445c1 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_bars", "key": { - "X": { - "tag": "forge:rods/diamond" - } + "X": "#forge:rods/diamond" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_bars_recycling.json index 60fe017df..593fab079 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:diamond_bars" - }, + "ingredient": "basemetals:diamond_bars", "result": { "count": 3, "id": "basemetals:diamond_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json index b16ca328f..ea10eecf7 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/diamond" - }, + "ingredient": "#forge:storage_blocks/diamond", "result": { "count": 9, "id": "basemetals:diamond_powder" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bolt.json b/src/generated/resources/data/basemetals/recipe/diamond_bolt.json index 4123cd348..b1cf902d9 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:diamond_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/diamond" - } + "F": "minecraft:feather", + "R": "#forge:rods/diamond" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_bolt_recycling.json index 2c97a440a..ead731b3f 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:diamond_bolt" - }, + "ingredient": "basemetals:diamond_bolt", "result": { "count": 2, "id": "basemetals:diamond_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json index 8a64a5650..fcecaf7e0 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/diamond" - }, + "plate": "#forge:plates/diamond", "target": "minecraft:diamond_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bow.json b/src/generated/resources/data/basemetals/recipe/diamond_bow.json index e9b975a7d..ebc6b9e9b 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bow.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:diamond_bow", "key": { - "R": { - "tag": "forge:rods/diamond" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/diamond", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_bow_recycling.json index d10f6255e..b941c49f7 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_bow" - }, + "ingredient": "basemetals:diamond_bow", "result": { "id": "minecraft:diamond" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_button.json b/src/generated/resources/data/basemetals/recipe/diamond_button.json index a6b668e3b..eb8ebad43 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_button.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_button", "key": { - "X": { - "tag": "forge:nuggets/diamond" - } + "X": "#forge:nuggets/diamond" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_button_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_button_recycling.json index a0efa5f49..1855f4a79 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:diamond_button" - }, + "ingredient": "basemetals:diamond_button", "result": { "count": 2, "id": "basemetals:diamond_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json index 0da1b9b28..4a5d5d564 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/diamond" - }, + "plate": "#forge:plates/diamond", "target": "minecraft:diamond_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_crackhammer.json b/src/generated/resources/data/basemetals/recipe/diamond_crackhammer.json index 72e1a2400..65f49dde7 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:diamond_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/diamond" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/diamond" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_crackhammer_recycling.json index f9f8d7022..45278bca8 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:diamond_crackhammer" - }, + "ingredient": "basemetals:diamond_crackhammer", "result": { "id": "minecraft:diamond_block" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_crossbow.json b/src/generated/resources/data/basemetals/recipe/diamond_crossbow.json index dc76b9b4e..b5a69150b 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:diamond_crossbow", "key": { - "G": { - "tag": "forge:gears/diamond" - }, - "R": { - "tag": "forge:rods/diamond" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/diamond", + "R": "#forge:rods/diamond", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_crossbow_recycling.json index 379dfc0db..fc7f496c8 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_crossbow" - }, + "ingredient": "basemetals:diamond_crossbow", "result": { "count": 4, "id": "minecraft:diamond" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_crushing.json index 17ab313cb..cf9ec177c 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:diamond" - }, + "ingredient": "minecraft:diamond", "result": { "id": "basemetals:diamond_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_door.json b/src/generated/resources/data/basemetals/recipe/diamond_door.json index beb4ba573..ad0af0b59 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_door.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_door", "key": { - "X": { - "tag": "forge:gems/diamond" - } + "X": "#forge:gems/diamond" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_door_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_door_recycling.json index b5a66fbe3..388a522f7 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_door" - }, + "ingredient": "basemetals:diamond_door", "result": { "count": 2, "id": "minecraft:diamond" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_fishingrod.json b/src/generated/resources/data/basemetals/recipe/diamond_fishingrod.json index de29e5dfc..4d6b3c287 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:diamond_fishing_rod", "key": { - "R": { - "tag": "forge:rods/diamond" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/diamond", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_gear.json b/src/generated/resources/data/basemetals/recipe/diamond_gear.json index fb7867995..fb8b81625 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_gear.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:diamond_gear", "key": { - "R": { - "tag": "forge:rods/diamond" - }, - "X": { - "tag": "forge:gems/diamond" - } + "R": "#forge:rods/diamond", + "X": "#forge:gems/diamond" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_gear_recycling.json index b5869d299..c5b6474dd 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_gear" - }, + "ingredient": "basemetals:diamond_gear", "result": { "id": "minecraft:diamond" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json index 84709c170..04a6c47a0 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/diamond" - }, + "plate": "#forge:plates/diamond", "target": "minecraft:diamond_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json index c06c8c165..0332be913 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/diamond" - }, + "plate": "#forge:plates/diamond", "target": "minecraft:diamond_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_lever.json b/src/generated/resources/data/basemetals/recipe/diamond_lever.json index 754900612..2ccdd9d7b 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_lever.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:diamond_lever", "key": { - "R": { - "tag": "forge:rods/diamond" - }, - "X": { - "tag": "forge:gems/diamond" - } + "R": "#forge:rods/diamond", + "X": "#forge:gems/diamond" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_lever_recycling.json index 50aedf238..da6265022 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_lever" - }, + "ingredient": "basemetals:diamond_lever", "result": { "id": "minecraft:diamond" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json index 3121071c8..a4eb8caa1 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/diamond" - }, + "ingredient": "#forge:nuggets/diamond", "result": { "id": "basemetals:diamond_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json index 5c47d2b24..8bc195d70 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/diamond" - }, + "ingredient": "#forge:ores/diamond", "result": { "count": 2, "id": "basemetals:diamond_powder" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/diamond_powder_from_small.json index 15a5f8b76..487626110 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:diamond_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/diamond" - } + "X": "#forge:tiny_dusts/diamond" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_powder_smelting.json index f4e8b2c5c..5ccb99272 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "tag": "forge:dusts/diamond" - }, + "ingredient": "#forge:dusts/diamond", "result": { "id": "minecraft:diamond" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate.json index 0fc3ede37..d63cc3331 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_pressure_plate", "key": { - "X": { - "tag": "forge:gems/diamond" - } + "X": "#forge:gems/diamond" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate_recycling.json index fbee8446e..9e6d73487 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_pressure_plate" - }, + "ingredient": "basemetals:diamond_pressure_plate", "result": { "count": 2, "id": "minecraft:diamond" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_rod.json b/src/generated/resources/data/basemetals/recipe/diamond_rod.json index a9fee2591..91ffef635 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_rod.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:diamond_rod", "key": { - "X": { - "tag": "forge:gems/diamond" - } + "X": "#forge:gems/diamond" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_rod_recycling.json index 1b2bcc7d9..96531b525 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:diamond_rod" - }, + "ingredient": "basemetals:diamond_rod", "result": { "count": 4, "id": "basemetals:diamond_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_scythe.json b/src/generated/resources/data/basemetals/recipe/diamond_scythe.json index 87c73596f..b69a89992 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:diamond_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/diamond" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/diamond" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_shears.json b/src/generated/resources/data/basemetals/recipe/diamond_shears.json index 61151c39d..7d261f67d 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_shears.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:diamond_shears", "key": { - "X": { - "tag": "forge:gems/diamond" - } + "X": "#forge:gems/diamond" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_shears_recycling.json index 39270eb70..2403add5b 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_shears" - }, + "ingredient": "basemetals:diamond_shears", "result": { "count": 2, "id": "minecraft:diamond" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_shield.json b/src/generated/resources/data/basemetals/recipe/diamond_shield.json index b027c0b19..f8ffd20f7 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_shield.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:diamond_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:gems/diamond" - } + "W": "#minecraft:planks", + "X": "#forge:gems/diamond" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json index 7027af041..e76c096d8 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/diamond" - }, + "plate": "#forge:plates/diamond", "target": "basemetals:diamond_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/diamond_slab.json b/src/generated/resources/data/basemetals/recipe/diamond_slab.json index 7ad0c33f3..b89257425 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_slab.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_slab", "key": { - "X": { - "tag": "forge:storage_blocks/diamond" - } + "X": "#forge:storage_blocks/diamond" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_slab_recycling.json index 22184b37c..e95fc1c6e 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:diamond_slab" - }, + "ingredient": "basemetals:diamond_slab", "result": { "count": 4, "id": "basemetals:diamond_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_smallblend_smelting.json index 4ac282940..b1e08565c 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "tag": "forge:small_blends/diamond" - }, + "ingredient": "#forge:small_blends/diamond", "result": { "id": "basemetals:diamond_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_smallpowder.json b/src/generated/resources/data/basemetals/recipe/diamond_smallpowder.json index 16e155c3a..ac9a88720 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:diamond_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/diamond" - } + "#forge:dusts/diamond" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/diamond_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/diamond_smallpowder_smelting.json index f14c15f52..dddc297a4 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "tag": "forge:tiny_dusts/diamond" - }, + "ingredient": "#forge:tiny_dusts/diamond", "result": { "id": "basemetals:diamond_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/diamond_stairs.json b/src/generated/resources/data/basemetals/recipe/diamond_stairs.json index 3294be0de..f041733a9 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/diamond" - } + "X": "#forge:storage_blocks/diamond" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_trapdoor.json b/src/generated/resources/data/basemetals/recipe/diamond_trapdoor.json index b1ddaa0ca..ceade99f1 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_trapdoor", "key": { - "X": { - "tag": "forge:gems/diamond" - } + "X": "#forge:gems/diamond" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_trapdoor_recycling.json index 5b426ead4..62eeef165 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:diamond_trapdoor" - }, + "ingredient": "basemetals:diamond_trapdoor", "result": { "count": 4, "id": "minecraft:diamond" diff --git a/src/generated/resources/data/basemetals/recipe/diamond_wall.json b/src/generated/resources/data/basemetals/recipe/diamond_wall.json index 1fb4547ef..9cd91749a 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_wall.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:diamond_wall", "key": { - "X": { - "tag": "forge:storage_blocks/diamond" - } + "X": "#forge:storage_blocks/diamond" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/diamond_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/diamond_wall_recycling.json index c91e3a166..9fa13bde6 100644 --- a/src/generated/resources/data/basemetals/recipe/diamond_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/diamond_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:diamond_wall" - }, + "ingredient": "basemetals:diamond_wall", "result": { "id": "minecraft:diamond_block" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_arrow.json b/src/generated/resources/data/basemetals/recipe/electrum_arrow.json index ad6eae2d8..58eec5bf9 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:electrum_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/electrum" - }, - "R": { - "tag": "forge:rods/electrum" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/electrum", + "R": "#forge:rods/electrum" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_arrow_recycling.json index d354223c6..71168ca5f 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:electrum_arrow" - }, + "ingredient": "basemetals:electrum_arrow", "result": { "id": "basemetals:electrum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_axe.json b/src/generated/resources/data/basemetals/recipe/electrum_axe.json index 32c70db75..85fce9c9a 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_axe.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/electrum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_axe_recycling.json index 432cc0da6..b71844b86 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_axe" - }, + "ingredient": "basemetals:electrum_axe", "result": { "count": 3, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bars.json b/src/generated/resources/data/basemetals/recipe/electrum_bars.json index 367c1d114..a46939927 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bars.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_bars", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bars_2.json b/src/generated/resources/data/basemetals/recipe/electrum_bars_2.json index 63be4861c..2e71cb30c 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_bars", "key": { - "X": { - "tag": "forge:rods/electrum" - } + "X": "#forge:rods/electrum" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_bars_recycling.json index 768213733..3b332a2a3 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:electrum_bars" - }, + "ingredient": "basemetals:electrum_bars", "result": { "count": 3, "id": "basemetals:electrum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_blend.json b/src/generated/resources/data/basemetals/recipe/electrum_blend.json index fa1284792..fa4f5b0dd 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_blend.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_blend.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:electrum_blend", "ingredients": [ - { - "tag": "forge:dusts/gold" - }, - { - "tag": "forge:dusts/silver" - } + "#forge:dusts/gold", + "#forge:dusts/silver" ], "result": { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipe/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/electrum_blend_from_small.json index e4bc15f10..d1eae110e 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_blend", "key": { - "X": { - "tag": "forge:small_blends/electrum" - } + "X": "#forge:small_blends/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_blend_smelting.json index 25da561ed..30042ee9f 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "tag": "forge:blends/electrum" - }, + "ingredient": "#forge:blends/electrum", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_block.json b/src/generated/resources/data/basemetals/recipe/electrum_block.json index b3e2f1c7c..71671cd0e 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_block.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_block", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json index ae1aebd99..87e0c8177 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/electrum" - }, + "ingredient": "#forge:storage_blocks/electrum", "result": { "count": 9, "id": "basemetals:electrum_powder" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_block_ingot.json b/src/generated/resources/data/basemetals/recipe/electrum_block_ingot.json index 1bc61a0df..230305247 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/electrum" - } + "#forge:storage_blocks/electrum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bolt.json b/src/generated/resources/data/basemetals/recipe/electrum_bolt.json index da744a6c4..cacbf55b6 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/electrum" - } + "F": "minecraft:feather", + "R": "#forge:rods/electrum" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_bolt_recycling.json index c19ad2552..83b7a1fc9 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:electrum_bolt" - }, + "ingredient": "basemetals:electrum_bolt", "result": { "count": 2, "id": "basemetals:electrum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_boots.json b/src/generated/resources/data/basemetals/recipe/electrum_boots.json index b9e442ed3..e57fb9007 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_boots.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:electrum_boots", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_boots_plate_repair.json index da656b2aa..58b7e85b2 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/electrum" - }, + "plate": "#forge:plates/electrum", "target": "basemetals:electrum_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_boots_recycling.json index 0646d47c4..cab5c8b87 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_boots" - }, + "ingredient": "basemetals:electrum_boots", "result": { "count": 4, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bow.json b/src/generated/resources/data/basemetals/recipe/electrum_bow.json index 6d6fc5846..00dbf7f1b 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bow.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_bow", "key": { - "R": { - "tag": "forge:rods/electrum" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/electrum", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_bow_recycling.json index 0843e63f7..3e600d33a 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_bow" - }, + "ingredient": "basemetals:electrum_bow", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_button.json b/src/generated/resources/data/basemetals/recipe/electrum_button.json index c4cd2ad1f..fea3a8349 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_button.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_button", "key": { - "X": { - "tag": "forge:nuggets/electrum" - } + "X": "#forge:nuggets/electrum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_button_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_button_recycling.json index 3bccf9610..6caf54410 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:electrum_button" - }, + "ingredient": "basemetals:electrum_button", "result": { "count": 2, "id": "basemetals:electrum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_chestplate.json b/src/generated/resources/data/basemetals/recipe/electrum_chestplate.json index d96643f2c..a06e17528 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:electrum_chestplate", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_chestplate_plate_repair.json index def370619..9545d1aea 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/electrum" - }, + "plate": "#forge:plates/electrum", "target": "basemetals:electrum_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_chestplate_recycling.json index 44045727f..080a6b64b 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_chestplate" - }, + "ingredient": "basemetals:electrum_chestplate", "result": { "count": 8, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_crackhammer.json b/src/generated/resources/data/basemetals/recipe/electrum_crackhammer.json index f4d7a70dd..bed82e419 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/electrum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_crackhammer_recycling.json index 4fe457c88..1e4a097b8 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:electrum_crackhammer" - }, + "ingredient": "basemetals:electrum_crackhammer", "result": { "id": "basemetals:electrum_block" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_crossbow.json b/src/generated/resources/data/basemetals/recipe/electrum_crossbow.json index 873e83039..950c8b839 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:electrum_crossbow", "key": { - "G": { - "tag": "forge:gears/electrum" - }, - "R": { - "tag": "forge:rods/electrum" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/electrum", + "R": "#forge:rods/electrum", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_crossbow_recycling.json index 7fa66791c..cdafbc802 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_crossbow" - }, + "ingredient": "basemetals:electrum_crossbow", "result": { "count": 4, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_door.json b/src/generated/resources/data/basemetals/recipe/electrum_door.json index 488f09587..c40c46e37 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_door.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_door", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_door_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_door_recycling.json index f1c6a8ac5..f51c03e63 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_door" - }, + "ingredient": "basemetals:electrum_door", "result": { "count": 2, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_fishingrod.json b/src/generated/resources/data/basemetals/recipe/electrum_fishingrod.json index 24515adc7..77a9e8fe8 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_fishing_rod", "key": { - "R": { - "tag": "forge:rods/electrum" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/electrum", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_gear.json b/src/generated/resources/data/basemetals/recipe/electrum_gear.json index 39527e0f6..30b6021ec 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_gear.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:electrum_gear", "key": { - "R": { - "tag": "forge:rods/electrum" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "R": "#forge:rods/electrum", + "X": "#forge:ingots/electrum" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_gear_recycling.json index 261c7f7da..80a4db673 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_gear" - }, + "ingredient": "basemetals:electrum_gear", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_helmet.json b/src/generated/resources/data/basemetals/recipe/electrum_helmet.json index fa43418c8..73aa7179a 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:electrum_helmet", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_helmet_plate_repair.json index 26a869c5a..0fd82886b 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/electrum" - }, + "plate": "#forge:plates/electrum", "target": "basemetals:electrum_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_helmet_recycling.json index 2b1358c1e..3f6de18f6 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_helmet" - }, + "ingredient": "basemetals:electrum_helmet", "result": { "count": 5, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_hoe.json b/src/generated/resources/data/basemetals/recipe/electrum_hoe.json index 5bddd3fcb..5034e7b1a 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/electrum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_hoe_recycling.json index b6cc661e6..ab31b9311 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_hoe" - }, + "ingredient": "basemetals:electrum_hoe", "result": { "count": 2, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_horsearmor.json b/src/generated/resources/data/basemetals/recipe/electrum_horsearmor.json index c9154e581..ede2eb5c8 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/electrum" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json index 5607b2ed2..9b1ab2799 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/electrum" - }, + "ingredient": "#forge:ingots/electrum", "result": { "id": "basemetals:electrum_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/electrum_ingot_from_nuggets.json index fa9da7cbc..68d9f34f3 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_ingot", "key": { - "X": { - "tag": "forge:nuggets/electrum" - } + "X": "#forge:nuggets/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_leggings.json b/src/generated/resources/data/basemetals/recipe/electrum_leggings.json index 90e588732..032d200c3 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:electrum_leggings", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_leggings_plate_repair.json index f2690ed23..37857bedf 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/electrum" - }, + "plate": "#forge:plates/electrum", "target": "basemetals:electrum_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_leggings_recycling.json index f49cff406..bb73621f9 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_leggings" - }, + "ingredient": "basemetals:electrum_leggings", "result": { "count": 7, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_lever.json b/src/generated/resources/data/basemetals/recipe/electrum_lever.json index 78af4102b..c64dc3dc2 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_lever.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:electrum_lever", "key": { - "R": { - "tag": "forge:rods/electrum" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "R": "#forge:rods/electrum", + "X": "#forge:ingots/electrum" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_lever_recycling.json index ab8048985..783bfa39c 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_lever" - }, + "ingredient": "basemetals:electrum_lever", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json index d2da24d95..6a4bd2b99 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/electrum" - }, + "ingredient": "#forge:nuggets/electrum", "result": { "id": "basemetals:electrum_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_nuggets.json b/src/generated/resources/data/basemetals/recipe/electrum_nuggets.json index 0c3a1ba31..5ec4ffb74 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_nugget", "ingredients": [ - { - "tag": "forge:ingots/electrum" - } + "#forge:ingots/electrum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/electrum_pickaxe.json b/src/generated/resources/data/basemetals/recipe/electrum_pickaxe.json index 3e5d8c15c..75db801fc 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_pickaxe_recycling.json index 60d8b1606..c908f4be3 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_pickaxe" - }, + "ingredient": "basemetals:electrum_pickaxe", "result": { "count": 3, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_plate.json b/src/generated/resources/data/basemetals/recipe/electrum_plate.json index 09447f63a..b20f77b29 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_plate.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_plate", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_plate_recycling.json index 3eb6e24fa..b8d9adff2 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_plate" - }, + "ingredient": "basemetals:electrum_plate", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/electrum_powder_from_small.json index 829387831..6c5760366 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/electrum" - } + "X": "#forge:tiny_dusts/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_powder_smelting.json index 55f147b2c..dbcae4260 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "tag": "forge:dusts/electrum" - }, + "ingredient": "#forge:dusts/electrum", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate.json index e533c3e01..3b7137be5 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate_recycling.json index aedc0ba3c..537dfd7ca 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_pressure_plate" - }, + "ingredient": "basemetals:electrum_pressure_plate", "result": { "count": 2, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_rod.json b/src/generated/resources/data/basemetals/recipe/electrum_rod.json index 86292d2d4..892c70e54 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_rod.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_rod", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_rod_recycling.json index aa97de8a2..662eca556 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:electrum_rod" - }, + "ingredient": "basemetals:electrum_rod", "result": { "count": 4, "id": "basemetals:electrum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_scythe.json b/src/generated/resources/data/basemetals/recipe/electrum_scythe.json index 30c34d620..6f78d290e 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/electrum" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_shears.json b/src/generated/resources/data/basemetals/recipe/electrum_shears.json index 8afa77a25..4bc308b28 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_shears.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:electrum_shears", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_shears_recycling.json index 94aae43f9..dc1c2bd63 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_shears" - }, + "ingredient": "basemetals:electrum_shears", "result": { "count": 2, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_shield.json b/src/generated/resources/data/basemetals/recipe/electrum_shield.json index 692271d9a..132dfb05d 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_shield.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/electrum" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/electrum_shield_plate_repair.json index 97bc18b74..b6e5807a4 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/electrum" - }, + "plate": "#forge:plates/electrum", "target": "basemetals:electrum_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/electrum_shovel.json b/src/generated/resources/data/basemetals/recipe/electrum_shovel.json index 8bbf0d578..9589d03eb 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/electrum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_shovel_recycling.json index 5b1809dee..ac23dac39 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_shovel" - }, + "ingredient": "basemetals:electrum_shovel", "result": { "id": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_slab.json b/src/generated/resources/data/basemetals/recipe/electrum_slab.json index 113dc341a..953c186f2 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_slab.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_slab", "key": { - "X": { - "tag": "forge:storage_blocks/electrum" - } + "X": "#forge:storage_blocks/electrum" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_slab_recycling.json index b4fe87700..5d467497d 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:electrum_slab" - }, + "ingredient": "basemetals:electrum_slab", "result": { "count": 4, "id": "basemetals:electrum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_smallblend.json b/src/generated/resources/data/basemetals/recipe/electrum_smallblend.json index c8a559bd3..14d40d556 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_smallblend", "ingredients": [ - { - "tag": "forge:blends/electrum" - } + "#forge:blends/electrum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/electrum_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_smallblend_smelting.json index e88d378c8..32673bf64 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "tag": "forge:small_blends/electrum" - }, + "ingredient": "#forge:small_blends/electrum", "result": { "id": "basemetals:electrum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_smallpowder.json b/src/generated/resources/data/basemetals/recipe/electrum_smallpowder.json index 30b8fd050..f95b8e25e 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:electrum_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/electrum" - } + "#forge:dusts/electrum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/electrum_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/electrum_smallpowder_smelting.json index 96304c5c0..a3b53b2fb 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "tag": "forge:tiny_dusts/electrum" - }, + "ingredient": "#forge:tiny_dusts/electrum", "result": { "id": "basemetals:electrum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/electrum_stairs.json b/src/generated/resources/data/basemetals/recipe/electrum_stairs.json index 5ddd160a9..128e96def 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/electrum" - } + "X": "#forge:storage_blocks/electrum" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_sword.json b/src/generated/resources/data/basemetals/recipe/electrum_sword.json index 2906f3c44..b7b6718a5 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_sword.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:electrum_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/electrum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/electrum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_sword_recycling.json index 8d76d6bc8..7457ab51e 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_sword" - }, + "ingredient": "basemetals:electrum_sword", "result": { "count": 2, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_trapdoor.json b/src/generated/resources/data/basemetals/recipe/electrum_trapdoor.json index 90c83488b..a2bbc7206 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_trapdoor", "key": { - "X": { - "tag": "forge:ingots/electrum" - } + "X": "#forge:ingots/electrum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_trapdoor_recycling.json index ab2247f9a..9de3baaca 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:electrum_trapdoor" - }, + "ingredient": "basemetals:electrum_trapdoor", "result": { "count": 4, "id": "basemetals:electrum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/electrum_wall.json b/src/generated/resources/data/basemetals/recipe/electrum_wall.json index cbbb4d52f..f6fdc5e41 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_wall.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:electrum_wall", "key": { - "X": { - "tag": "forge:storage_blocks/electrum" - } + "X": "#forge:storage_blocks/electrum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/electrum_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/electrum_wall_recycling.json index 40b5b8896..82dbb7a64 100644 --- a/src/generated/resources/data/basemetals/recipe/electrum_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/electrum_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:electrum_wall" - }, + "ingredient": "basemetals:electrum_wall", "result": { "id": "basemetals:electrum_block" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_arrow.json b/src/generated/resources/data/basemetals/recipe/emerald_arrow.json index 67fcc9502..e12164136 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:emerald_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/emerald" - }, - "R": { - "tag": "forge:rods/emerald" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/emerald", + "R": "#forge:rods/emerald" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_arrow_recycling.json index 809c38629..3b3586d39 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:emerald_arrow" - }, + "ingredient": "basemetals:emerald_arrow", "result": { "id": "basemetals:emerald_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_axe.json b/src/generated/resources/data/basemetals/recipe/emerald_axe.json index dca948106..8db3ffca2 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_axe.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/emerald" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_axe_recycling.json index 0d60c371c..965ef6239 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_axe" - }, + "ingredient": "basemetals:emerald_axe", "result": { "count": 3, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bars.json b/src/generated/resources/data/basemetals/recipe/emerald_bars.json index d966c48b5..830f1bbd8 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bars.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_bars", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bars_2.json b/src/generated/resources/data/basemetals/recipe/emerald_bars_2.json index 538bdcb75..7b24e19b0 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_bars", "key": { - "X": { - "tag": "forge:rods/emerald" - } + "X": "#forge:rods/emerald" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_bars_recycling.json index e2431f0eb..ddc56b19c 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:emerald_bars" - }, + "ingredient": "basemetals:emerald_bars", "result": { "count": 3, "id": "basemetals:emerald_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json index d35a20c5b..ed405f90c 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/emerald" - }, + "ingredient": "#forge:storage_blocks/emerald", "result": { "count": 9, "id": "basemetals:emerald_powder" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bolt.json b/src/generated/resources/data/basemetals/recipe/emerald_bolt.json index 1f282000e..822c871f8 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/emerald" - } + "F": "minecraft:feather", + "R": "#forge:rods/emerald" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_bolt_recycling.json index e531df5d9..a5a22798b 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:emerald_bolt" - }, + "ingredient": "basemetals:emerald_bolt", "result": { "count": 2, "id": "basemetals:emerald_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_boots.json b/src/generated/resources/data/basemetals/recipe/emerald_boots.json index fc3b26660..0e5e176b7 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_boots.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:emerald_boots", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json index 209efc5b5..1c96fcbc9 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/emerald" - }, + "plate": "#forge:plates/emerald", "target": "basemetals:emerald_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_boots_recycling.json index 002617033..9df251947 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_boots" - }, + "ingredient": "basemetals:emerald_boots", "result": { "count": 4, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bow.json b/src/generated/resources/data/basemetals/recipe/emerald_bow.json index 82d984bbe..ca61e041a 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bow.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_bow", "key": { - "R": { - "tag": "forge:rods/emerald" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/emerald", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_bow_recycling.json index 1a34c16bb..4556d570f 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_bow" - }, + "ingredient": "basemetals:emerald_bow", "result": { "id": "minecraft:emerald" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_button.json b/src/generated/resources/data/basemetals/recipe/emerald_button.json index d81fb9421..2b221aa8f 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_button.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_button", "key": { - "X": { - "tag": "forge:nuggets/emerald" - } + "X": "#forge:nuggets/emerald" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_button_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_button_recycling.json index 47be53d08..cc0cd9ada 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:emerald_button" - }, + "ingredient": "basemetals:emerald_button", "result": { "count": 2, "id": "basemetals:emerald_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_chestplate.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate.json index 3665bf06b..dc7a220e8 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:emerald_chestplate", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json index bcc786ba7..c17f48f1a 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/emerald" - }, + "plate": "#forge:plates/emerald", "target": "basemetals:emerald_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_recycling.json index 91f717b21..68351b183 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_chestplate" - }, + "ingredient": "basemetals:emerald_chestplate", "result": { "count": 8, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_crackhammer.json b/src/generated/resources/data/basemetals/recipe/emerald_crackhammer.json index 51b17afd0..d695e3409 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/emerald" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_crackhammer_recycling.json index 16e64c92c..48ab57874 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:emerald_crackhammer" - }, + "ingredient": "basemetals:emerald_crackhammer", "result": { "id": "minecraft:emerald_block" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_crossbow.json b/src/generated/resources/data/basemetals/recipe/emerald_crossbow.json index 89ab692cb..e326a610e 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:emerald_crossbow", "key": { - "G": { - "tag": "forge:gears/emerald" - }, - "R": { - "tag": "forge:rods/emerald" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/emerald", + "R": "#forge:rods/emerald", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_crossbow_recycling.json index db336fe9d..34283e683 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_crossbow" - }, + "ingredient": "basemetals:emerald_crossbow", "result": { "count": 4, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_crushing.json index 684cb7959..9af8fc9b0 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:emerald" - }, + "ingredient": "minecraft:emerald", "result": { "id": "basemetals:emerald_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_door.json b/src/generated/resources/data/basemetals/recipe/emerald_door.json index 11c49f068..ead8a3062 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_door.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_door", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_door_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_door_recycling.json index 318374f1f..9a8dc2427 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_door" - }, + "ingredient": "basemetals:emerald_door", "result": { "count": 2, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_fishingrod.json b/src/generated/resources/data/basemetals/recipe/emerald_fishingrod.json index a7ce3eb64..941f39b10 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_fishing_rod", "key": { - "R": { - "tag": "forge:rods/emerald" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/emerald", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_gear.json b/src/generated/resources/data/basemetals/recipe/emerald_gear.json index 3950285c8..2bc37a524 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_gear.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:emerald_gear", "key": { - "R": { - "tag": "forge:rods/iron" - }, - "X": { - "tag": "forge:gems/emerald" - } + "R": "#forge:rods/iron", + "X": "#forge:gems/emerald" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_gear_recycling.json index 282b53f7b..d9355fc87 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_gear" - }, + "ingredient": "basemetals:emerald_gear", "result": { "id": "minecraft:emerald" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_helmet.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet.json index 0d8428413..1a9867498 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:emerald_helmet", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json index 9ee0bc63c..bc18e218e 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/emerald" - }, + "plate": "#forge:plates/emerald", "target": "basemetals:emerald_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_helmet_recycling.json index 48ceb5285..bee44d6c7 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_helmet" - }, + "ingredient": "basemetals:emerald_helmet", "result": { "count": 5, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_hoe.json b/src/generated/resources/data/basemetals/recipe/emerald_hoe.json index e9a6f8f00..ef888dfaf 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/emerald" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_hoe_recycling.json index 7cb92ed28..70e6f0f4f 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_hoe" - }, + "ingredient": "basemetals:emerald_hoe", "result": { "count": 2, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_horsearmor.json b/src/generated/resources/data/basemetals/recipe/emerald_horsearmor.json index 1ae16d70a..ce3c71185 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:gems/emerald" - } + "W": "#minecraft:wool", + "X": "#forge:gems/emerald" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_leggings.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings.json index f6cabc627..188f75736 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:emerald_leggings", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json index 5d9561a0f..434ad9452 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/emerald" - }, + "plate": "#forge:plates/emerald", "target": "basemetals:emerald_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_leggings_recycling.json index e20db95e0..7f7b77d4e 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_leggings" - }, + "ingredient": "basemetals:emerald_leggings", "result": { "count": 7, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_lever.json b/src/generated/resources/data/basemetals/recipe/emerald_lever.json index e0d23b18c..f91f0f564 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_lever.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:emerald_lever", "key": { - "R": { - "tag": "forge:rods/emerald" - }, - "X": { - "tag": "forge:gems/emerald" - } + "R": "#forge:rods/emerald", + "X": "#forge:gems/emerald" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_lever_recycling.json index eec4bd932..78ba3621b 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_lever" - }, + "ingredient": "basemetals:emerald_lever", "result": { "id": "minecraft:emerald" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json index 4c1f7e18a..a8b88d2f1 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/emerald" - }, + "ingredient": "#forge:nuggets/emerald", "result": { "id": "basemetals:emerald_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json index 39c59f955..2f0688031 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/emerald" - }, + "ingredient": "#forge:ores/emerald", "result": { "count": 2, "id": "basemetals:emerald_powder" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_pickaxe.json b/src/generated/resources/data/basemetals/recipe/emerald_pickaxe.json index 39ea517fa..1ee21a4ac 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/emerald" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_pickaxe_recycling.json index ca3086d00..b1018bc52 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_pickaxe" - }, + "ingredient": "basemetals:emerald_pickaxe", "result": { "count": 3, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/emerald_powder_from_small.json index cbb9050d5..58763e48b 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:emerald_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/emerald" - } + "X": "#forge:tiny_dusts/emerald" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/emerald_powder_smelting.json index 31a1a0bd6..2906b3642 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "tag": "forge:dusts/emerald" - }, + "ingredient": "#forge:dusts/emerald", "result": { "id": "minecraft:emerald" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate.json index 86921e3d4..c7a64c28c 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_pressure_plate", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate_recycling.json index bb487f818..cb56f47c0 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_pressure_plate" - }, + "ingredient": "basemetals:emerald_pressure_plate", "result": { "count": 2, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_rod.json b/src/generated/resources/data/basemetals/recipe/emerald_rod.json index 9c1246ea4..2c391cc5c 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_rod.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:emerald_rod", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_rod_recycling.json index 8b3609385..aae89cb5c 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:emerald_rod" - }, + "ingredient": "basemetals:emerald_rod", "result": { "count": 4, "id": "basemetals:emerald_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_scythe.json b/src/generated/resources/data/basemetals/recipe/emerald_scythe.json index a02ec23a0..9f1808ab5 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/emerald" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shears.json b/src/generated/resources/data/basemetals/recipe/emerald_shears.json index cebae4184..0ddbaa0a1 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_shears.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:emerald_shears", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_shears_recycling.json index 720249e95..eee76e5f8 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_shears" - }, + "ingredient": "basemetals:emerald_shears", "result": { "count": 2, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shield.json b/src/generated/resources/data/basemetals/recipe/emerald_shield.json index ea9038967..487bfda15 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_shield.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:gems/emerald" - } + "W": "#minecraft:planks", + "X": "#forge:gems/emerald" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json index cdcbdde57..e26551566 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/emerald" - }, + "plate": "#forge:plates/emerald", "target": "basemetals:emerald_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shovel.json b/src/generated/resources/data/basemetals/recipe/emerald_shovel.json index f335c6c7a..87e77b611 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/emerald" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_shovel_recycling.json index f665ec316..a0c535eff 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_shovel" - }, + "ingredient": "basemetals:emerald_shovel", "result": { "id": "minecraft:emerald" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_slab.json b/src/generated/resources/data/basemetals/recipe/emerald_slab.json index 755105555..f6c269fe0 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_slab.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_slab", "key": { - "X": { - "tag": "forge:storage_blocks/emerald" - } + "X": "#forge:storage_blocks/emerald" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_slab_recycling.json index b48c90b95..0830eae4d 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:emerald_slab" - }, + "ingredient": "basemetals:emerald_slab", "result": { "count": 4, "id": "basemetals:emerald_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_smallpowder.json b/src/generated/resources/data/basemetals/recipe/emerald_smallpowder.json index acf561d79..7041c2889 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:emerald_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/emerald" - } + "#forge:dusts/emerald" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/emerald_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/emerald_smallpowder_smelting.json index 4ec37b9a6..a6c4ce8db 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "tag": "forge:tiny_dusts/emerald" - }, + "ingredient": "#forge:tiny_dusts/emerald", "result": { "id": "basemetals:emerald_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/emerald_stairs.json b/src/generated/resources/data/basemetals/recipe/emerald_stairs.json index 3bf4a85d3..6b55a586a 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/emerald" - } + "X": "#forge:storage_blocks/emerald" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_sword.json b/src/generated/resources/data/basemetals/recipe/emerald_sword.json index 062a86961..e6cbed103 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_sword.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:emerald_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/emerald" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/emerald" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_sword_recycling.json index 5354c7bc8..e76e3f11f 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_sword" - }, + "ingredient": "basemetals:emerald_sword", "result": { "count": 2, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_trapdoor.json b/src/generated/resources/data/basemetals/recipe/emerald_trapdoor.json index 9b84f21f3..c63091195 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_trapdoor", "key": { - "X": { - "tag": "forge:gems/emerald" - } + "X": "#forge:gems/emerald" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_trapdoor_recycling.json index 54e36846e..f2c8c0481 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:emerald_trapdoor" - }, + "ingredient": "basemetals:emerald_trapdoor", "result": { "count": 4, "id": "minecraft:emerald" diff --git a/src/generated/resources/data/basemetals/recipe/emerald_wall.json b/src/generated/resources/data/basemetals/recipe/emerald_wall.json index cd05d67c5..ae462565f 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_wall.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:emerald_wall", "key": { - "X": { - "tag": "forge:storage_blocks/emerald" - } + "X": "#forge:storage_blocks/emerald" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/emerald_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/emerald_wall_recycling.json index ffa2808e3..d321a9b03 100644 --- a/src/generated/resources/data/basemetals/recipe/emerald_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/emerald_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:emerald_wall" - }, + "ingredient": "basemetals:emerald_wall", "result": { "id": "minecraft:emerald_block" } diff --git a/src/generated/resources/data/basemetals/recipe/flint_and_steel.json b/src/generated/resources/data/basemetals/recipe/flint_and_steel.json index 50fb52e08..0e8c8a912 100644 --- a/src/generated/resources/data/basemetals/recipe/flint_and_steel.json +++ b/src/generated/resources/data/basemetals/recipe/flint_and_steel.json @@ -5,12 +5,8 @@ "category": "misc", "group": "minecraft:flint_and_steel", "ingredients": [ - { - "tag": "forge:ingots/steel" - }, - { - "item": "minecraft:flint" - } + "#forge:ingots/steel", + "minecraft:flint" ], "result": { "id": "minecraft:flint_and_steel" diff --git a/src/generated/resources/data/basemetals/recipe/glass_crushing.json b/src/generated/resources/data/basemetals/recipe/glass_crushing.json index eaef557e6..354e53985 100644 --- a/src/generated/resources/data/basemetals/recipe/glass_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/glass_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:glass" - }, + "ingredient": "minecraft:glass", "result": { "id": "minecraft:sand" } diff --git a/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json b/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json index 8bff73a4e..441c71691 100644 --- a/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/glowstone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:glowstone" - }, + "ingredient": "minecraft:glowstone", "result": { "count": 4, "id": "minecraft:glowstone_dust" diff --git a/src/generated/resources/data/basemetals/recipe/gold_arrow.json b/src/generated/resources/data/basemetals/recipe/gold_arrow.json index 234c9529b..8283fc319 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/gold_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:gold_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/gold" - }, - "R": { - "tag": "forge:rods/gold" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/gold", + "R": "#forge:rods/gold" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/gold_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_arrow_recycling.json index 8000fc1fb..3fb9028d5 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:gold_arrow" - }, + "ingredient": "basemetals:gold_arrow", "result": { "id": "minecraft:gold_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_bars.json b/src/generated/resources/data/basemetals/recipe/gold_bars.json index 51ed15701..0cbfd6ca6 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bars.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_bars", "key": { - "X": { - "tag": "forge:ingots/gold" - } + "X": "#forge:ingots/gold" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/gold_bars_2.json b/src/generated/resources/data/basemetals/recipe/gold_bars_2.json index 5e20f761a..658655026 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_bars", "key": { - "X": { - "tag": "forge:rods/gold" - } + "X": "#forge:rods/gold" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/gold_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_bars_recycling.json index 9cd96c591..87c9129d6 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:gold_bars" - }, + "ingredient": "basemetals:gold_bars", "result": { "count": 3, "id": "minecraft:gold_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json index 74b66bd83..ee9ba8500 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/gold" - }, + "ingredient": "#forge:storage_blocks/gold", "result": { "count": 9, "id": "basemetals:gold_powder" diff --git a/src/generated/resources/data/basemetals/recipe/gold_bolt.json b/src/generated/resources/data/basemetals/recipe/gold_bolt.json index dbc79021a..ea26075fc 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:gold_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/gold" - } + "F": "minecraft:feather", + "R": "#forge:rods/gold" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/gold_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_bolt_recycling.json index 40dd08147..8a2101957 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:gold_bolt" - }, + "ingredient": "basemetals:gold_bolt", "result": { "count": 2, "id": "minecraft:gold_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/gold_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_boots_plate_repair.json index c1049764c..305400473 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/gold_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/gold" - }, + "plate": "#forge:plates/gold", "target": "minecraft:golden_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_bow.json b/src/generated/resources/data/basemetals/recipe/gold_bow.json index a9ed112c3..46389694d 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bow.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:gold_bow", "key": { - "R": { - "tag": "forge:rods/gold" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/gold", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/gold_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_bow_recycling.json index 89473ab7f..e2747908d 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_bow" - }, + "ingredient": "basemetals:gold_bow", "result": { "id": "minecraft:gold_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_button.json b/src/generated/resources/data/basemetals/recipe/gold_button.json index 9ceb99b6d..bf0d64858 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_button.json +++ b/src/generated/resources/data/basemetals/recipe/gold_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_button", "key": { - "X": { - "tag": "forge:nuggets/gold" - } + "X": "#forge:nuggets/gold" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/gold_button_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_button_recycling.json index 29564c299..162e62737 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:gold_button" - }, + "ingredient": "basemetals:gold_button", "result": { "count": 2, "id": "minecraft:gold_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/gold_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_chestplate_plate_repair.json index ed9d53c5d..06dac91b3 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/gold_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/gold" - }, + "plate": "#forge:plates/gold", "target": "minecraft:golden_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_crackhammer.json b/src/generated/resources/data/basemetals/recipe/gold_crackhammer.json index aef821a3b..5a36e27d8 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/gold_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:gold_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/gold" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/gold" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/gold_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_crackhammer_recycling.json index 2ef0fc087..74c6d322c 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:gold_crackhammer" - }, + "ingredient": "basemetals:gold_crackhammer", "result": { "id": "minecraft:gold_block" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_crossbow.json b/src/generated/resources/data/basemetals/recipe/gold_crossbow.json index ab9c51bdd..0413a32a1 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/gold_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:gold_crossbow", "key": { - "G": { - "tag": "forge:gears/gold" - }, - "R": { - "tag": "forge:rods/gold" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/gold", + "R": "#forge:rods/gold", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/gold_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_crossbow_recycling.json index dc2a4ba52..daae50fb1 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_crossbow" - }, + "ingredient": "basemetals:gold_crossbow", "result": { "count": 4, "id": "minecraft:gold_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/gold_door.json b/src/generated/resources/data/basemetals/recipe/gold_door.json index 71c7c2adb..8c52faa96 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_door.json +++ b/src/generated/resources/data/basemetals/recipe/gold_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_door", "key": { - "X": { - "tag": "forge:ingots/gold" - } + "X": "#forge:ingots/gold" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/gold_door_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_door_recycling.json index b3cba165f..d8fa942e1 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_door" - }, + "ingredient": "basemetals:gold_door", "result": { "count": 2, "id": "minecraft:gold_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/gold_fishingrod.json b/src/generated/resources/data/basemetals/recipe/gold_fishingrod.json index 767d83465..5218310fa 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/gold_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:gold_fishing_rod", "key": { - "R": { - "tag": "forge:rods/gold" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/gold", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/gold_gear.json b/src/generated/resources/data/basemetals/recipe/gold_gear.json index b9fab9b06..124f8a8de 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_gear.json +++ b/src/generated/resources/data/basemetals/recipe/gold_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:gold_gear", "key": { - "R": { - "tag": "forge:rods/gold" - }, - "X": { - "tag": "forge:ingots/gold" - } + "R": "#forge:rods/gold", + "X": "#forge:ingots/gold" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/gold_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_gear_recycling.json index f561da250..5ed08ec5d 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_gear" - }, + "ingredient": "basemetals:gold_gear", "result": { "id": "minecraft:gold_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_helmet_plate_repair.json index 514a641d3..aefb400f6 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/gold_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/gold" - }, + "plate": "#forge:plates/gold", "target": "minecraft:golden_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json index 7f96b38d3..76aafcce0 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/gold" - }, + "ingredient": "#forge:ingots/gold", "result": { "id": "basemetals:gold_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_leggings_plate_repair.json index 5b4875d36..bb647cb5c 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/gold_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/gold" - }, + "plate": "#forge:plates/gold", "target": "minecraft:golden_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_lever.json b/src/generated/resources/data/basemetals/recipe/gold_lever.json index 7135a2fcc..2bff71ec6 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_lever.json +++ b/src/generated/resources/data/basemetals/recipe/gold_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:gold_lever", "key": { - "R": { - "tag": "forge:rods/gold" - }, - "X": { - "tag": "forge:ingots/gold" - } + "R": "#forge:rods/gold", + "X": "#forge:ingots/gold" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/gold_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_lever_recycling.json index 4f8c9d1c1..8cb906a99 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_lever" - }, + "ingredient": "basemetals:gold_lever", "result": { "id": "minecraft:gold_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json index b19e77aab..a3d44145a 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/gold" - }, + "ingredient": "#forge:nuggets/gold", "result": { "id": "basemetals:gold_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json index 59ce48929..591c9f7d1 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/gold" - }, + "ingredient": "#forge:ores/gold", "result": { "count": 2, "id": "basemetals:gold_powder" diff --git a/src/generated/resources/data/basemetals/recipe/gold_plate.json b/src/generated/resources/data/basemetals/recipe/gold_plate.json index 4a148658e..5c2b690d3 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_plate.json +++ b/src/generated/resources/data/basemetals/recipe/gold_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_plate", "key": { - "X": { - "tag": "forge:ingots/gold" - } + "X": "#forge:ingots/gold" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/gold_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_plate_recycling.json index 35f9b28fd..6cd84911f 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_plate" - }, + "ingredient": "basemetals:gold_plate", "result": { "id": "minecraft:gold_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/gold_powder_from_small.json index 8d601295c..11cd39856 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/gold_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:gold_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/gold" - } + "X": "#forge:tiny_dusts/gold" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/gold_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_powder_smelting.json index ffa6ed79e..cde2d7dc6 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/gold_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "tag": "forge:dusts/gold" - }, + "ingredient": "#forge:dusts/gold", "result": { "id": "minecraft:gold_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json index c07de81c5..ca2c6eeaf 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gold_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/gold" - }, + "ingredient": "#forge:raw_materials/gold", "result": { "id": "basemetals:gold_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_rod.json b/src/generated/resources/data/basemetals/recipe/gold_rod.json index 69e60ad91..5b820573a 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_rod.json +++ b/src/generated/resources/data/basemetals/recipe/gold_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:gold_rod", "key": { - "X": { - "tag": "forge:ingots/gold" - } + "X": "#forge:ingots/gold" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/gold_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_rod_recycling.json index 9eaee0654..fcb9f5780 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:gold_rod" - }, + "ingredient": "basemetals:gold_rod", "result": { "count": 4, "id": "minecraft:gold_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/gold_scythe.json b/src/generated/resources/data/basemetals/recipe/gold_scythe.json index f555dc356..c83d94a2b 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/gold_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:gold_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/gold" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/gold" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/gold_shears.json b/src/generated/resources/data/basemetals/recipe/gold_shears.json index 51d6c6040..6aa246edc 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_shears.json +++ b/src/generated/resources/data/basemetals/recipe/gold_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:gold_shears", "key": { - "X": { - "tag": "forge:ingots/gold" - } + "X": "#forge:ingots/gold" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/gold_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_shears_recycling.json index 4c0ae8a89..44955383f 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_shears" - }, + "ingredient": "basemetals:gold_shears", "result": { "count": 2, "id": "minecraft:gold_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/gold_shield.json b/src/generated/resources/data/basemetals/recipe/gold_shield.json index 42b4ebe91..40be401e2 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_shield.json +++ b/src/generated/resources/data/basemetals/recipe/gold_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:gold_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/gold" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/gold" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/gold_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/gold_shield_plate_repair.json index 30f702b0f..c964b5700 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/gold_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/gold" - }, + "plate": "#forge:plates/gold", "target": "basemetals:gold_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/gold_slab.json b/src/generated/resources/data/basemetals/recipe/gold_slab.json index 96f42fc91..5687680f0 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_slab.json +++ b/src/generated/resources/data/basemetals/recipe/gold_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_slab", "key": { - "X": { - "tag": "forge:storage_blocks/gold" - } + "X": "#forge:storage_blocks/gold" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/gold_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_slab_recycling.json index 049e9e175..e6ff3e7e7 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "item": "basemetals:gold_slab" - }, + "ingredient": "basemetals:gold_slab", "result": { "count": 4, "id": "minecraft:gold_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/gold_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_smallblend_smelting.json index 5b090f166..353b96bce 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/gold_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "tag": "forge:small_blends/gold" - }, + "ingredient": "#forge:small_blends/gold", "result": { "id": "minecraft:gold_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_smallpowder.json b/src/generated/resources/data/basemetals/recipe/gold_smallpowder.json index 1f9980fb0..f189f00fe 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/gold_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:gold_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/gold" - } + "#forge:dusts/gold" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/gold_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/gold_smallpowder_smelting.json index 281536ce0..4371c9057 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/gold_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.11, - "ingredient": { - "tag": "forge:tiny_dusts/gold" - }, + "ingredient": "#forge:tiny_dusts/gold", "result": { "id": "minecraft:gold_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/gold_stairs.json b/src/generated/resources/data/basemetals/recipe/gold_stairs.json index a12d98c62..7eeb7a5f1 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/gold_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/gold" - } + "X": "#forge:storage_blocks/gold" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/gold_trapdoor.json b/src/generated/resources/data/basemetals/recipe/gold_trapdoor.json index b9b191e97..151f56050 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/gold_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_trapdoor", "key": { - "X": { - "tag": "forge:ingots/gold" - } + "X": "#forge:ingots/gold" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/gold_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_trapdoor_recycling.json index d7481fead..b2a7b13f5 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.0, - "ingredient": { - "item": "basemetals:gold_trapdoor" - }, + "ingredient": "basemetals:gold_trapdoor", "result": { "count": 4, "id": "minecraft:gold_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/gold_wall.json b/src/generated/resources/data/basemetals/recipe/gold_wall.json index e953d7d18..a5e28d15f 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_wall.json +++ b/src/generated/resources/data/basemetals/recipe/gold_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:gold_wall", "key": { - "X": { - "tag": "forge:storage_blocks/gold" - } + "X": "#forge:storage_blocks/gold" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/gold_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/gold_wall_recycling.json index ee616b716..02bda88b5 100644 --- a/src/generated/resources/data/basemetals/recipe/gold_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/gold_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:gold_wall" - }, + "ingredient": "basemetals:gold_wall", "result": { "id": "minecraft:gold_block" } diff --git a/src/generated/resources/data/basemetals/recipe/gravel_crushing.json b/src/generated/resources/data/basemetals/recipe/gravel_crushing.json index 4f7476dbf..7d1f84073 100644 --- a/src/generated/resources/data/basemetals/recipe/gravel_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/gravel_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:gravel" - }, + "ingredient": "#forge:gravel", "result": { "id": "minecraft:sand" } diff --git a/src/generated/resources/data/basemetals/recipe/human_detector.json b/src/generated/resources/data/basemetals/recipe/human_detector.json index 9c62708d0..3dca57e28 100644 --- a/src/generated/resources/data/basemetals/recipe/human_detector.json +++ b/src/generated/resources/data/basemetals/recipe/human_detector.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:human_detector", "key": { - "G": { - "tag": "forge:gears" - }, - "X": { - "item": "minecraft:brick" - } + "G": "#forge:gears", + "X": "minecraft:brick" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_arrow.json b/src/generated/resources/data/basemetals/recipe/invar_arrow.json index 909fd20e9..ed0005f21 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/invar_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:invar_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/invar" - }, - "R": { - "tag": "forge:rods/invar" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/invar", + "R": "#forge:rods/invar" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/invar_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_arrow_recycling.json index 7f0b490ad..3695f15c2 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "item": "basemetals:invar_arrow" - }, + "ingredient": "basemetals:invar_arrow", "result": { "id": "basemetals:invar_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_axe.json b/src/generated/resources/data/basemetals/recipe/invar_axe.json index f9235858b..9a6810bfc 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_axe.json +++ b/src/generated/resources/data/basemetals/recipe/invar_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/invar" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_axe_recycling.json index 0e2588e64..cee5ca47a 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_axe" - }, + "ingredient": "basemetals:invar_axe", "result": { "count": 3, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_bars.json b/src/generated/resources/data/basemetals/recipe/invar_bars.json index bb0de6683..a9fe850ef 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bars.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_bars", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_bars_2.json b/src/generated/resources/data/basemetals/recipe/invar_bars_2.json index 264387469..ae0a80f40 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_bars", "key": { - "X": { - "tag": "forge:rods/invar" - } + "X": "#forge:rods/invar" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/invar_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_bars_recycling.json index f010ff28b..237431b0a 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "item": "basemetals:invar_bars" - }, + "ingredient": "basemetals:invar_bars", "result": { "count": 3, "id": "basemetals:invar_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/invar_blend.json b/src/generated/resources/data/basemetals/recipe/invar_blend.json index b33a528bb..067490e78 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_blend.json +++ b/src/generated/resources/data/basemetals/recipe/invar_blend.json @@ -5,15 +5,9 @@ "category": "misc", "group": "basemetals:invar_blend", "ingredients": [ - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/nickel" - } + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/nickel" ], "result": { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipe/invar_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/invar_blend_from_small.json index a691fe189..eff74d638 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/invar_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_blend", "key": { - "X": { - "tag": "forge:small_blends/invar" - } + "X": "#forge:small_blends/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_blend_smelting.json index 048db3f2f..bfdc9e307 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/invar_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "tag": "forge:blends/invar" - }, + "ingredient": "#forge:blends/invar", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_block.json b/src/generated/resources/data/basemetals/recipe/invar_block.json index 09843920c..1a92ef941 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_block.json +++ b/src/generated/resources/data/basemetals/recipe/invar_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_block", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json index 0d6491647..a6369449d 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/invar_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/invar" - }, + "ingredient": "#forge:storage_blocks/invar", "result": { "count": 9, "id": "basemetals:invar_powder" diff --git a/src/generated/resources/data/basemetals/recipe/invar_block_ingot.json b/src/generated/resources/data/basemetals/recipe/invar_block_ingot.json index 6f7e1dd19..131e69d65 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/invar_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/invar" - } + "#forge:storage_blocks/invar" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/invar_bolt.json b/src/generated/resources/data/basemetals/recipe/invar_bolt.json index 8a6483173..742018e48 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/invar" - } + "F": "minecraft:feather", + "R": "#forge:rods/invar" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/invar_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_bolt_recycling.json index 97d2d73c3..fc6f4e409 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "item": "basemetals:invar_bolt" - }, + "ingredient": "basemetals:invar_bolt", "result": { "count": 2, "id": "basemetals:invar_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/invar_boots.json b/src/generated/resources/data/basemetals/recipe/invar_boots.json index b4f7eb5ba..844f0f8c4 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_boots.json +++ b/src/generated/resources/data/basemetals/recipe/invar_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:invar_boots", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_boots_recycling.json index 6d95bfee8..13b8e2e8b 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_boots" - }, + "ingredient": "basemetals:invar_boots", "result": { "count": 4, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_bow.json b/src/generated/resources/data/basemetals/recipe/invar_bow.json index 46bdee3d2..37dd60d0c 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bow.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_bow", "key": { - "R": { - "tag": "forge:rods/invar" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/invar", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/invar_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_bow_recycling.json index 1c8dcfb73..4b7c5edee 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_bow" - }, + "ingredient": "basemetals:invar_bow", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_button.json b/src/generated/resources/data/basemetals/recipe/invar_button.json index 538b88e69..98675eecb 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_button.json +++ b/src/generated/resources/data/basemetals/recipe/invar_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_button", "key": { - "X": { - "tag": "forge:nuggets/invar" - } + "X": "#forge:nuggets/invar" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_button_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_button_recycling.json index 78acfbbb8..e61176aa8 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "item": "basemetals:invar_button" - }, + "ingredient": "basemetals:invar_button", "result": { "count": 2, "id": "basemetals:invar_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/invar_chestplate.json b/src/generated/resources/data/basemetals/recipe/invar_chestplate.json index 2174ac1b8..bf4aab826 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/invar_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:invar_chestplate", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_chestplate_recycling.json index 0a6d25f75..282d61bd0 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_chestplate" - }, + "ingredient": "basemetals:invar_chestplate", "result": { "count": 8, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_crackhammer.json b/src/generated/resources/data/basemetals/recipe/invar_crackhammer.json index 03871110f..0de32c520 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/invar_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/invar" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_crackhammer_recycling.json index 48c416fe6..304c233d7 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:invar_crackhammer" - }, + "ingredient": "basemetals:invar_crackhammer", "result": { "id": "basemetals:invar_block" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_crossbow.json b/src/generated/resources/data/basemetals/recipe/invar_crossbow.json index 715325bf1..7ed4d3333 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/invar_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:invar_crossbow", "key": { - "G": { - "tag": "forge:gears/invar" - }, - "R": { - "tag": "forge:rods/invar" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/invar", + "R": "#forge:rods/invar", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/invar_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_crossbow_recycling.json index 2fc27b659..34609ab63 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_crossbow" - }, + "ingredient": "basemetals:invar_crossbow", "result": { "count": 4, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_door.json b/src/generated/resources/data/basemetals/recipe/invar_door.json index 6f1746a07..00bf76961 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_door.json +++ b/src/generated/resources/data/basemetals/recipe/invar_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_door", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_door_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_door_recycling.json index 45d05b4d3..7a06d1181 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_door" - }, + "ingredient": "basemetals:invar_door", "result": { "count": 2, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_fishingrod.json b/src/generated/resources/data/basemetals/recipe/invar_fishingrod.json index 7729a8835..dcbec2352 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/invar_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_fishing_rod", "key": { - "R": { - "tag": "forge:rods/invar" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/invar", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/invar_gear.json b/src/generated/resources/data/basemetals/recipe/invar_gear.json index 5a23e863e..88681f4ea 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_gear.json +++ b/src/generated/resources/data/basemetals/recipe/invar_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:invar_gear", "key": { - "R": { - "tag": "forge:rods/invar" - }, - "X": { - "tag": "forge:ingots/invar" - } + "R": "#forge:rods/invar", + "X": "#forge:ingots/invar" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/invar_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_gear_recycling.json index e30b5c21d..2c8ba6fdc 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_gear" - }, + "ingredient": "basemetals:invar_gear", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_helmet.json b/src/generated/resources/data/basemetals/recipe/invar_helmet.json index 0de4d6b77..d571af6fb 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/invar_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:invar_helmet", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_helmet_recycling.json index 1db3b3275..df2fe7999 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_helmet" - }, + "ingredient": "basemetals:invar_helmet", "result": { "count": 5, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_hoe.json b/src/generated/resources/data/basemetals/recipe/invar_hoe.json index 2a3f71a45..722d1109f 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/invar_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/invar" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_hoe_recycling.json index c575ae767..2318376cc 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_hoe" - }, + "ingredient": "basemetals:invar_hoe", "result": { "count": 2, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_horsearmor.json b/src/generated/resources/data/basemetals/recipe/invar_horsearmor.json index 7685a8335..e218c68b2 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/invar_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/invar" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/invar" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json index d13cf86dc..6a81fa3bf 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/invar_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/invar" - }, + "ingredient": "#forge:ingots/invar", "result": { "id": "basemetals:invar_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/invar_ingot_from_nuggets.json index 302eafb17..090218d02 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/invar_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_ingot", "key": { - "X": { - "tag": "forge:nuggets/invar" - } + "X": "#forge:nuggets/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_leggings.json b/src/generated/resources/data/basemetals/recipe/invar_leggings.json index 82b13ca25..96b7e99dd 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/invar_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:invar_leggings", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_leggings_recycling.json index e14f2fe6d..8bd8ffe9f 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_leggings" - }, + "ingredient": "basemetals:invar_leggings", "result": { "count": 7, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_lever.json b/src/generated/resources/data/basemetals/recipe/invar_lever.json index 7ba6a5329..6f4c27e50 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_lever.json +++ b/src/generated/resources/data/basemetals/recipe/invar_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:invar_lever", "key": { - "R": { - "tag": "forge:rods/invar" - }, - "X": { - "tag": "forge:ingots/invar" - } + "R": "#forge:rods/invar", + "X": "#forge:ingots/invar" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/invar_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_lever_recycling.json index 632bd1e2f..c5f3d549a 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_lever" - }, + "ingredient": "basemetals:invar_lever", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json index e775121ec..4a28b09ff 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/invar_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/invar" - }, + "ingredient": "#forge:nuggets/invar", "result": { "id": "basemetals:invar_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_nuggets.json b/src/generated/resources/data/basemetals/recipe/invar_nuggets.json index 7648e22e3..f48a7544e 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/invar_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_nugget", "ingredients": [ - { - "tag": "forge:ingots/invar" - } + "#forge:ingots/invar" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/invar_pickaxe.json b/src/generated/resources/data/basemetals/recipe/invar_pickaxe.json index 23d0e5b0f..bccf268aa 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/invar_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_pickaxe_recycling.json index dfc3b5f36..fe31514a3 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_pickaxe" - }, + "ingredient": "basemetals:invar_pickaxe", "result": { "count": 3, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_plate.json b/src/generated/resources/data/basemetals/recipe/invar_plate.json index 8bb198abe..6c81698ac 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_plate.json +++ b/src/generated/resources/data/basemetals/recipe/invar_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_plate", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/invar_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_plate_recycling.json index 91601fd09..ac3502d14 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_plate" - }, + "ingredient": "basemetals:invar_plate", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/invar_powder_from_small.json index a13be37f9..875d56fe0 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/invar_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/invar" - } + "X": "#forge:tiny_dusts/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_powder_smelting.json index f1f1ef152..3dab1dd02 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/invar_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "tag": "forge:dusts/invar" - }, + "ingredient": "#forge:dusts/invar", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/invar_pressure_plate.json index 50bc95e1a..bb292abe6 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/invar_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/invar_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_pressure_plate_recycling.json index ee39408e9..bd271432f 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_pressure_plate" - }, + "ingredient": "basemetals:invar_pressure_plate", "result": { "count": 2, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_rod.json b/src/generated/resources/data/basemetals/recipe/invar_rod.json index 128e1274b..48cc9245c 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_rod.json +++ b/src/generated/resources/data/basemetals/recipe/invar_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_rod", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_rod_recycling.json index 07b466b84..de35fe637 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "item": "basemetals:invar_rod" - }, + "ingredient": "basemetals:invar_rod", "result": { "count": 4, "id": "basemetals:invar_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/invar_scythe.json b/src/generated/resources/data/basemetals/recipe/invar_scythe.json index 621c94c0a..dc1240138 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/invar_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/invar" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/invar_shears.json b/src/generated/resources/data/basemetals/recipe/invar_shears.json index 17c7430cc..dab23c65c 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_shears.json +++ b/src/generated/resources/data/basemetals/recipe/invar_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:invar_shears", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_shears_recycling.json index 2113b4437..9119c19e8 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_shears" - }, + "ingredient": "basemetals:invar_shears", "result": { "count": 2, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_shield.json b/src/generated/resources/data/basemetals/recipe/invar_shield.json index c5efa3ccb..e43794511 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_shield.json +++ b/src/generated/resources/data/basemetals/recipe/invar_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/invar" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/invar" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_shovel.json b/src/generated/resources/data/basemetals/recipe/invar_shovel.json index 19da2dd62..71dfd877f 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/invar_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/invar" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_shovel_recycling.json index 8cf976e5a..fd1647feb 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_shovel" - }, + "ingredient": "basemetals:invar_shovel", "result": { "id": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_slab.json b/src/generated/resources/data/basemetals/recipe/invar_slab.json index 330d887f2..3436e6869 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_slab.json +++ b/src/generated/resources/data/basemetals/recipe/invar_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_slab", "key": { - "X": { - "tag": "forge:storage_blocks/invar" - } + "X": "#forge:storage_blocks/invar" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/invar_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_slab_recycling.json index 755d83992..2226662b3 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "item": "basemetals:invar_slab" - }, + "ingredient": "basemetals:invar_slab", "result": { "count": 4, "id": "basemetals:invar_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/invar_smallblend.json b/src/generated/resources/data/basemetals/recipe/invar_smallblend.json index b9b5c1dc4..831abb175 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/invar_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_smallblend", "ingredients": [ - { - "tag": "forge:blends/invar" - } + "#forge:blends/invar" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/invar_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_smallblend_smelting.json index e21e347fc..d58e816d2 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/invar_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "tag": "forge:small_blends/invar" - }, + "ingredient": "#forge:small_blends/invar", "result": { "id": "basemetals:invar_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_smallpowder.json b/src/generated/resources/data/basemetals/recipe/invar_smallpowder.json index 3da4fc749..779677b83 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/invar_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:invar_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/invar" - } + "#forge:dusts/invar" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/invar_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/invar_smallpowder_smelting.json index 016212a97..b6497054c 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/invar_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.03, - "ingredient": { - "tag": "forge:tiny_dusts/invar" - }, + "ingredient": "#forge:tiny_dusts/invar", "result": { "id": "basemetals:invar_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/invar_stairs.json b/src/generated/resources/data/basemetals/recipe/invar_stairs.json index 0949ad9f7..4fc13b62e 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/invar_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/invar" - } + "X": "#forge:storage_blocks/invar" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/invar_sword.json b/src/generated/resources/data/basemetals/recipe/invar_sword.json index aae647dcf..7faa5ff6c 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_sword.json +++ b/src/generated/resources/data/basemetals/recipe/invar_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:invar_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/invar" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/invar" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/invar_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_sword_recycling.json index 29efa9f61..cde709e78 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_sword" - }, + "ingredient": "basemetals:invar_sword", "result": { "count": 2, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_trapdoor.json b/src/generated/resources/data/basemetals/recipe/invar_trapdoor.json index 2a96fcfbe..39c7d43df 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/invar_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_trapdoor", "key": { - "X": { - "tag": "forge:ingots/invar" - } + "X": "#forge:ingots/invar" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_trapdoor_recycling.json index 3d1d49f79..cdc7d4f67 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.3, - "ingredient": { - "item": "basemetals:invar_trapdoor" - }, + "ingredient": "basemetals:invar_trapdoor", "result": { "count": 4, "id": "basemetals:invar_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/invar_wall.json b/src/generated/resources/data/basemetals/recipe/invar_wall.json index 082da1f58..69f1433f1 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_wall.json +++ b/src/generated/resources/data/basemetals/recipe/invar_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:invar_wall", "key": { - "X": { - "tag": "forge:storage_blocks/invar" - } + "X": "#forge:storage_blocks/invar" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/invar_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/invar_wall_recycling.json index a28a3bce4..7c32cd03d 100644 --- a/src/generated/resources/data/basemetals/recipe/invar_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/invar_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:invar_wall" - }, + "ingredient": "basemetals:invar_wall", "result": { "id": "basemetals:invar_block" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_arrow.json b/src/generated/resources/data/basemetals/recipe/iron_arrow.json index 43d692dd9..2af6a51bc 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/iron_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:iron_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/iron" - }, - "R": { - "tag": "forge:rods/iron" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/iron", + "R": "#forge:rods/iron" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/iron_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_arrow_recycling.json index 09ff70eff..ecaf47c47 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:iron_arrow" - }, + "ingredient": "basemetals:iron_arrow", "result": { "id": "minecraft:iron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_bars_2.json b/src/generated/resources/data/basemetals/recipe/iron_bars_2.json index c25739c5e..d553dfaf8 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/iron_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:iron_bars", "key": { - "X": { - "tag": "forge:rods/iron" - } + "X": "#forge:rods/iron" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json index 39faabddc..18caa4695 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/iron" - }, + "ingredient": "#forge:storage_blocks/iron", "result": { "count": 9, "id": "basemetals:iron_powder" diff --git a/src/generated/resources/data/basemetals/recipe/iron_bolt.json b/src/generated/resources/data/basemetals/recipe/iron_bolt.json index 1c4d5f1ec..7507b9102 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/iron_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:iron_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/iron" - } + "F": "minecraft:feather", + "R": "#forge:rods/iron" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/iron_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_bolt_recycling.json index 45be8f593..797cfeb1e 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:iron_bolt" - }, + "ingredient": "basemetals:iron_bolt", "result": { "count": 2, "id": "minecraft:iron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/iron_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_boots_plate_repair.json index edbfac8ab..46129aef7 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/iron_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/iron" - }, + "plate": "#forge:plates/iron", "target": "minecraft:iron_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_bow.json b/src/generated/resources/data/basemetals/recipe/iron_bow.json index 8a0984e9a..7c144beb9 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_bow.json +++ b/src/generated/resources/data/basemetals/recipe/iron_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:iron_bow", "key": { - "R": { - "tag": "forge:rods/iron" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/iron", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/iron_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_bow_recycling.json index 1b7e0fafb..2acbf1cc8 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:iron_bow" - }, + "ingredient": "basemetals:iron_bow", "result": { "id": "minecraft:iron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_button.json b/src/generated/resources/data/basemetals/recipe/iron_button.json index 0c9390e50..973d4be0c 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_button.json +++ b/src/generated/resources/data/basemetals/recipe/iron_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:iron_button", "key": { - "X": { - "tag": "forge:nuggets/iron" - } + "X": "#forge:nuggets/iron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/iron_button_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_button_recycling.json index 893513aaa..972888d5e 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:iron_button" - }, + "ingredient": "basemetals:iron_button", "result": { "count": 2, "id": "minecraft:iron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/iron_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_chestplate_plate_repair.json index 94d9e6f0e..d57b83319 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/iron_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/iron" - }, + "plate": "#forge:plates/iron", "target": "minecraft:iron_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_crackhammer.json b/src/generated/resources/data/basemetals/recipe/iron_crackhammer.json index 8e3a7cf95..8a5ff10ce 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/iron_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:iron_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/iron" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/iron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/iron_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_crackhammer_recycling.json index f80dfc394..34e723196 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:iron_crackhammer" - }, + "ingredient": "basemetals:iron_crackhammer", "result": { "id": "minecraft:iron_block" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_crossbow.json b/src/generated/resources/data/basemetals/recipe/iron_crossbow.json index 486cab380..09785f29c 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/iron_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:iron_crossbow", "key": { - "G": { - "tag": "forge:gears/iron" - }, - "R": { - "tag": "forge:rods/iron" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/iron", + "R": "#forge:rods/iron", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/iron_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_crossbow_recycling.json index c6943f0b6..d468637ba 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:iron_crossbow" - }, + "ingredient": "basemetals:iron_crossbow", "result": { "count": 4, "id": "minecraft:iron_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/iron_fishingrod.json b/src/generated/resources/data/basemetals/recipe/iron_fishingrod.json index 616934652..2185b1064 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/iron_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:iron_fishing_rod", "key": { - "R": { - "tag": "forge:rods/iron" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/iron", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/iron_gear.json b/src/generated/resources/data/basemetals/recipe/iron_gear.json index e48d2b128..3e982f8ac 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_gear.json +++ b/src/generated/resources/data/basemetals/recipe/iron_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:iron_gear", "key": { - "R": { - "tag": "forge:rods/iron" - }, - "X": { - "tag": "forge:ingots/iron" - } + "R": "#forge:rods/iron", + "X": "#forge:ingots/iron" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/iron_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_gear_recycling.json index bf718d3c8..cfc2e55fb 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:iron_gear" - }, + "ingredient": "basemetals:iron_gear", "result": { "id": "minecraft:iron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_helmet_plate_repair.json index 944e83096..3e3733e9f 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/iron_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/iron" - }, + "plate": "#forge:plates/iron", "target": "minecraft:iron_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json index 8c31f6840..9433c64cc 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/iron" - }, + "ingredient": "#forge:ingots/iron", "result": { "id": "basemetals:iron_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_leggings_plate_repair.json index 357169345..80b2d9346 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/iron_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/iron" - }, + "plate": "#forge:plates/iron", "target": "minecraft:iron_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_lever.json b/src/generated/resources/data/basemetals/recipe/iron_lever.json index 491d8253b..c5afe56c7 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_lever.json +++ b/src/generated/resources/data/basemetals/recipe/iron_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:iron_lever", "key": { - "R": { - "tag": "forge:rods/iron" - }, - "X": { - "tag": "forge:ingots/iron" - } + "R": "#forge:rods/iron", + "X": "#forge:ingots/iron" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/iron_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_lever_recycling.json index b534643e3..75bbba4ad 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:iron_lever" - }, + "ingredient": "basemetals:iron_lever", "result": { "id": "minecraft:iron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json index b2d47e686..1f4c53449 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/iron" - }, + "ingredient": "#forge:nuggets/iron", "result": { "id": "basemetals:iron_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json index 97ac8726c..7914cee68 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/iron" - }, + "ingredient": "#forge:ores/iron", "result": { "count": 2, "id": "basemetals:iron_powder" diff --git a/src/generated/resources/data/basemetals/recipe/iron_plate.json b/src/generated/resources/data/basemetals/recipe/iron_plate.json index 49590579a..5a9ebd4a0 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_plate.json +++ b/src/generated/resources/data/basemetals/recipe/iron_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:iron_plate", "key": { - "X": { - "tag": "forge:ingots/iron" - } + "X": "#forge:ingots/iron" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/iron_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_plate_recycling.json index 85db887ae..61b121e9a 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:iron_plate" - }, + "ingredient": "basemetals:iron_plate", "result": { "id": "minecraft:iron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/iron_powder_from_small.json index 6f20da29f..a10c96432 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/iron_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:iron_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/iron" - } + "X": "#forge:tiny_dusts/iron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/iron_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_powder_smelting.json index a997d2d2c..0844744d4 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/iron_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:dusts/iron" - }, + "ingredient": "#forge:dusts/iron", "result": { "id": "minecraft:iron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json index f59b3c1a7..9520e0c2e 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/iron_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/iron" - }, + "ingredient": "#forge:raw_materials/iron", "result": { "id": "basemetals:iron_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_rod.json b/src/generated/resources/data/basemetals/recipe/iron_rod.json index 4ca13409e..4d219f5d8 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_rod.json +++ b/src/generated/resources/data/basemetals/recipe/iron_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:iron_rod", "key": { - "X": { - "tag": "forge:ingots/iron" - } + "X": "#forge:ingots/iron" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/iron_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_rod_recycling.json index e2a929cc0..ae8a3a8fd 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:iron_rod" - }, + "ingredient": "basemetals:iron_rod", "result": { "count": 4, "id": "minecraft:iron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/iron_scythe.json b/src/generated/resources/data/basemetals/recipe/iron_scythe.json index 8e6576dff..e75550c21 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/iron_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:iron_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/iron" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/iron" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/iron_shield.json b/src/generated/resources/data/basemetals/recipe/iron_shield.json index c11d7242d..71edbf2db 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_shield.json +++ b/src/generated/resources/data/basemetals/recipe/iron_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:iron_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/iron" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/iron" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/iron_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/iron_shield_plate_repair.json index ac9725fc1..ce248a6cb 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/iron_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/iron" - }, + "plate": "#forge:plates/iron", "target": "basemetals:iron_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/iron_slab.json b/src/generated/resources/data/basemetals/recipe/iron_slab.json index 87ca67672..8fadf7189 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_slab.json +++ b/src/generated/resources/data/basemetals/recipe/iron_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:iron_slab", "key": { - "X": { - "tag": "forge:storage_blocks/iron" - } + "X": "#forge:storage_blocks/iron" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/iron_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_slab_recycling.json index 150d09506..3f3057c8c 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "item": "basemetals:iron_slab" - }, + "ingredient": "basemetals:iron_slab", "result": { "count": 4, "id": "minecraft:iron_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/iron_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_smallblend_smelting.json index 6cb1f6e72..57a1464ad 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/iron_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "tag": "forge:small_blends/iron" - }, + "ingredient": "#forge:small_blends/iron", "result": { "id": "minecraft:iron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_smallpowder.json b/src/generated/resources/data/basemetals/recipe/iron_smallpowder.json index 60ac4cbb6..c4710102b 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/iron_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:iron_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/iron" - } + "#forge:dusts/iron" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/iron_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/iron_smallpowder_smelting.json index a89a5d671..edff6d8a2 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/iron_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.05, - "ingredient": { - "tag": "forge:tiny_dusts/iron" - }, + "ingredient": "#forge:tiny_dusts/iron", "result": { "id": "minecraft:iron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/iron_stairs.json b/src/generated/resources/data/basemetals/recipe/iron_stairs.json index e91292477..f569cd6b2 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/iron_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:iron_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/iron" - } + "X": "#forge:storage_blocks/iron" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/iron_wall.json b/src/generated/resources/data/basemetals/recipe/iron_wall.json index c1ef12f06..9bc6c4e83 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_wall.json +++ b/src/generated/resources/data/basemetals/recipe/iron_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:iron_wall", "key": { - "X": { - "tag": "forge:storage_blocks/iron" - } + "X": "#forge:storage_blocks/iron" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/iron_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/iron_wall_recycling.json index fc218290d..c0367b0d0 100644 --- a/src/generated/resources/data/basemetals/recipe/iron_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/iron_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:iron_wall" - }, + "ingredient": "basemetals:iron_wall", "result": { "id": "minecraft:iron_block" } diff --git a/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json b/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json index c61ec366f..e8cd8be80 100644 --- a/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lapis_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/lapis" - }, + "ingredient": "#forge:storage_blocks/lapis", "result": { "count": 9, "id": "minecraft:lapis_lazuli" diff --git a/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json index 408627225..2c4da2d42 100644 --- a/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lapis_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/lapis" - }, + "ingredient": "#forge:ores/lapis", "result": { "count": 8, "id": "minecraft:lapis_lazuli" diff --git a/src/generated/resources/data/basemetals/recipe/lead_arrow.json b/src/generated/resources/data/basemetals/recipe/lead_arrow.json index 93c2e2284..98b84f36a 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/lead_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:lead_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/lead" - }, - "R": { - "tag": "forge:rods/lead" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/lead", + "R": "#forge:rods/lead" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/lead_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_arrow_recycling.json index 0e25701e7..5eebbc141 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:lead_arrow" - }, + "ingredient": "basemetals:lead_arrow", "result": { "id": "basemetals:lead_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_axe.json b/src/generated/resources/data/basemetals/recipe/lead_axe.json index 6e611f1b7..13527cfb0 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_axe.json +++ b/src/generated/resources/data/basemetals/recipe/lead_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/lead" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_axe_recycling.json index cadae44ed..98b1d0719 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_axe" - }, + "ingredient": "basemetals:lead_axe", "result": { "count": 3, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_bars.json b/src/generated/resources/data/basemetals/recipe/lead_bars.json index 3b6fa7fda..18e9dee74 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bars.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_bars", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_bars_2.json b/src/generated/resources/data/basemetals/recipe/lead_bars_2.json index 041170258..1585cd950 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_bars", "key": { - "X": { - "tag": "forge:rods/lead" - } + "X": "#forge:rods/lead" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/lead_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_bars_recycling.json index 1999a6658..dd8ce613d 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:lead_bars" - }, + "ingredient": "basemetals:lead_bars", "result": { "count": 3, "id": "basemetals:lead_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/lead_block.json b/src/generated/resources/data/basemetals/recipe/lead_block.json index 55ac9e7d9..f313c8390 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_block.json +++ b/src/generated/resources/data/basemetals/recipe/lead_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_block", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json index 138f94575..77ed9e25a 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/lead" - }, + "ingredient": "#forge:storage_blocks/lead", "result": { "count": 9, "id": "basemetals:lead_powder" diff --git a/src/generated/resources/data/basemetals/recipe/lead_block_ingot.json b/src/generated/resources/data/basemetals/recipe/lead_block_ingot.json index 13470691f..5050afd42 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/lead_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:lead_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/lead" - } + "#forge:storage_blocks/lead" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/lead_bolt.json b/src/generated/resources/data/basemetals/recipe/lead_bolt.json index 1c1abdf81..e9cade05f 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/lead" - } + "F": "minecraft:feather", + "R": "#forge:rods/lead" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/lead_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_bolt_recycling.json index b2bc47f04..bddbaebf3 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:lead_bolt" - }, + "ingredient": "basemetals:lead_bolt", "result": { "count": 2, "id": "basemetals:lead_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/lead_boots.json b/src/generated/resources/data/basemetals/recipe/lead_boots.json index a92dd674c..997d6531c 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_boots.json +++ b/src/generated/resources/data/basemetals/recipe/lead_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:lead_boots", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_boots_plate_repair.json index a21e1c265..9b0b9ac9b 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/lead_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/lead" - }, + "plate": "#forge:plates/lead", "target": "basemetals:lead_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_boots_recycling.json index 30c17a904..5449ef8fa 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_boots" - }, + "ingredient": "basemetals:lead_boots", "result": { "count": 4, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_bow.json b/src/generated/resources/data/basemetals/recipe/lead_bow.json index a29e96592..2c36db10c 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bow.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_bow", "key": { - "R": { - "tag": "forge:rods/lead" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/lead", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/lead_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_bow_recycling.json index ccf3aa8fe..7f22124ae 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_bow" - }, + "ingredient": "basemetals:lead_bow", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_button.json b/src/generated/resources/data/basemetals/recipe/lead_button.json index 4bd3c5a66..ec6cee0ac 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_button.json +++ b/src/generated/resources/data/basemetals/recipe/lead_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_button", "key": { - "X": { - "tag": "forge:nuggets/lead" - } + "X": "#forge:nuggets/lead" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_button_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_button_recycling.json index 648e0eb84..b45ee753e 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:lead_button" - }, + "ingredient": "basemetals:lead_button", "result": { "count": 2, "id": "basemetals:lead_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/lead_chestplate.json b/src/generated/resources/data/basemetals/recipe/lead_chestplate.json index 732c5eca3..8bea1031b 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/lead_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:lead_chestplate", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_chestplate_plate_repair.json index f01bf7a59..ac824c1eb 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/lead_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/lead" - }, + "plate": "#forge:plates/lead", "target": "basemetals:lead_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_chestplate_recycling.json index f2f55d979..7816a9d1a 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_chestplate" - }, + "ingredient": "basemetals:lead_chestplate", "result": { "count": 8, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_crackhammer.json b/src/generated/resources/data/basemetals/recipe/lead_crackhammer.json index ec3ddcfd6..f068e26ac 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/lead_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/lead" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_crackhammer_recycling.json index acfbb8800..ef44c2690 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:lead_crackhammer" - }, + "ingredient": "basemetals:lead_crackhammer", "result": { "id": "basemetals:lead_block" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_crossbow.json b/src/generated/resources/data/basemetals/recipe/lead_crossbow.json index 5b97f8426..051849d7e 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/lead_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:lead_crossbow", "key": { - "G": { - "tag": "forge:gears/lead" - }, - "R": { - "tag": "forge:rods/lead" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/lead", + "R": "#forge:rods/lead", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/lead_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_crossbow_recycling.json index 1d487c9fa..bec6f9267 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_crossbow" - }, + "ingredient": "basemetals:lead_crossbow", "result": { "count": 4, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_door.json b/src/generated/resources/data/basemetals/recipe/lead_door.json index 957c39884..86d5ae644 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_door.json +++ b/src/generated/resources/data/basemetals/recipe/lead_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_door", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_door_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_door_recycling.json index 457edb31f..75f7443f8 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_door" - }, + "ingredient": "basemetals:lead_door", "result": { "count": 2, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_fishingrod.json b/src/generated/resources/data/basemetals/recipe/lead_fishingrod.json index dacf8655d..86052ef82 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/lead_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_fishing_rod", "key": { - "R": { - "tag": "forge:rods/lead" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/lead", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/lead_gear.json b/src/generated/resources/data/basemetals/recipe/lead_gear.json index 8a77c5c95..2b679c9bd 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_gear.json +++ b/src/generated/resources/data/basemetals/recipe/lead_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:lead_gear", "key": { - "R": { - "tag": "forge:rods/lead" - }, - "X": { - "tag": "forge:ingots/lead" - } + "R": "#forge:rods/lead", + "X": "#forge:ingots/lead" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/lead_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_gear_recycling.json index e30aa14e3..1a9994e89 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_gear" - }, + "ingredient": "basemetals:lead_gear", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_helmet.json b/src/generated/resources/data/basemetals/recipe/lead_helmet.json index e76b1dcab..1a6b6e865 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/lead_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:lead_helmet", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_helmet_plate_repair.json index dd551c4c4..69a700eac 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/lead_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/lead" - }, + "plate": "#forge:plates/lead", "target": "basemetals:lead_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_helmet_recycling.json index 7303dc529..999fcc5ba 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_helmet" - }, + "ingredient": "basemetals:lead_helmet", "result": { "count": 5, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_hoe.json b/src/generated/resources/data/basemetals/recipe/lead_hoe.json index b0eaff30b..948715da6 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/lead_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/lead" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_hoe_recycling.json index 7992a2628..440d6e6b3 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_hoe" - }, + "ingredient": "basemetals:lead_hoe", "result": { "count": 2, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_horsearmor.json b/src/generated/resources/data/basemetals/recipe/lead_horsearmor.json index 482d4eadb..9e999fde8 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/lead_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/lead" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/lead" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json index 430d0b7a5..26e10be55 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/lead" - }, + "ingredient": "#forge:ingots/lead", "result": { "id": "basemetals:lead_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/lead_ingot_from_nuggets.json index 13c03f907..bbff2cdc6 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:lead_ingot", "key": { - "X": { - "tag": "forge:nuggets/lead" - } + "X": "#forge:nuggets/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_leggings.json b/src/generated/resources/data/basemetals/recipe/lead_leggings.json index 07e02cf58..9b1472e6f 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/lead_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:lead_leggings", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_leggings_plate_repair.json index 8f60a8e4d..4aa74ef55 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/lead_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/lead" - }, + "plate": "#forge:plates/lead", "target": "basemetals:lead_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_leggings_recycling.json index ca28aa786..c3821c5b5 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_leggings" - }, + "ingredient": "basemetals:lead_leggings", "result": { "count": 7, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_lever.json b/src/generated/resources/data/basemetals/recipe/lead_lever.json index 2b976b5e7..e58674a86 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_lever.json +++ b/src/generated/resources/data/basemetals/recipe/lead_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:lead_lever", "key": { - "R": { - "tag": "forge:rods/lead" - }, - "X": { - "tag": "forge:ingots/lead" - } + "R": "#forge:rods/lead", + "X": "#forge:ingots/lead" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/lead_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_lever_recycling.json index 38cac4111..e1d275a9b 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_lever" - }, + "ingredient": "basemetals:lead_lever", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json index cf6201824..498b356b9 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/lead" - }, + "ingredient": "#forge:nuggets/lead", "result": { "id": "basemetals:lead_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_nuggets.json b/src/generated/resources/data/basemetals/recipe/lead_nuggets.json index 65856a9f6..679dd0b05 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/lead_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:lead_nugget", "ingredients": [ - { - "tag": "forge:ingots/lead" - } + "#forge:ingots/lead" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/lead_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/lead_ore_blasting.json index 7fcced3be..bb2d338fd 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/lead" - }, + "ingredient": "#forge:ores/lead", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json index 206ac5b60..85e955021 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/lead" - }, + "ingredient": "#forge:ores/lead", "result": { "count": 2, "id": "basemetals:lead_powder" diff --git a/src/generated/resources/data/basemetals/recipe/lead_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_ore_smelting.json index 7388232e2..b538bc368 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/lead_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/lead" - }, + "ingredient": "#forge:ores/lead", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_pickaxe.json b/src/generated/resources/data/basemetals/recipe/lead_pickaxe.json index 711fa686f..6fd2e8970 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/lead_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_pickaxe_recycling.json index b5eb2fb17..22d82c2e4 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_pickaxe" - }, + "ingredient": "basemetals:lead_pickaxe", "result": { "count": 3, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_plate.json b/src/generated/resources/data/basemetals/recipe/lead_plate.json index 3bb2ee8d7..5984ae343 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_plate.json +++ b/src/generated/resources/data/basemetals/recipe/lead_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_plate", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/lead_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_plate_recycling.json index 0f3d2915b..f06afb4ae 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_plate" - }, + "ingredient": "basemetals:lead_plate", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/lead_powder_from_small.json index 17f0afd31..f471607c8 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/lead_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:lead_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/lead" - } + "X": "#forge:tiny_dusts/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_powder_smelting.json index 88a96944e..e3524b55e 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/lead_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/lead" - }, + "ingredient": "#forge:dusts/lead", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/lead_pressure_plate.json index 51b4c8827..7a9d001d6 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/lead_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/lead_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_pressure_plate_recycling.json index c5c1a93c3..49124db65 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_pressure_plate" - }, + "ingredient": "basemetals:lead_pressure_plate", "result": { "count": 2, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/lead_raw_blasting.json index 2f49a967c..ba3371a71 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/lead_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/lead" - }, + "ingredient": "#forge:raw_materials/lead", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json index ee341ad8d..58b53d646 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/lead_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/lead" - }, + "ingredient": "#forge:raw_materials/lead", "result": { "id": "basemetals:lead_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_raw_smelting.json index d1c72a0e9..3fb3c4bac 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/lead_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/lead" - }, + "ingredient": "#forge:raw_materials/lead", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_rod.json b/src/generated/resources/data/basemetals/recipe/lead_rod.json index e75ec0504..b8e82d6c4 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_rod.json +++ b/src/generated/resources/data/basemetals/recipe/lead_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:lead_rod", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_rod_recycling.json index 1799ce908..b5a39f32a 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:lead_rod" - }, + "ingredient": "basemetals:lead_rod", "result": { "count": 4, "id": "basemetals:lead_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/lead_scythe.json b/src/generated/resources/data/basemetals/recipe/lead_scythe.json index 9cddf716a..f9c485406 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/lead_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/lead" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/lead_shears.json b/src/generated/resources/data/basemetals/recipe/lead_shears.json index b51c9ffd0..0e3430c68 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_shears.json +++ b/src/generated/resources/data/basemetals/recipe/lead_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:lead_shears", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_shears_recycling.json index 142970793..76b6c409b 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_shears" - }, + "ingredient": "basemetals:lead_shears", "result": { "count": 2, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_shield.json b/src/generated/resources/data/basemetals/recipe/lead_shield.json index 5bd65543f..62782f7f6 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_shield.json +++ b/src/generated/resources/data/basemetals/recipe/lead_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/lead" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/lead" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/lead_shield_plate_repair.json index acb872b5d..d49b898c9 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/lead_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/lead" - }, + "plate": "#forge:plates/lead", "target": "basemetals:lead_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/lead_shovel.json b/src/generated/resources/data/basemetals/recipe/lead_shovel.json index 1a7547259..e55d2f0bc 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/lead_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/lead" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_shovel_recycling.json index 0a419f4a8..3ef9d98a4 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_shovel" - }, + "ingredient": "basemetals:lead_shovel", "result": { "id": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_slab.json b/src/generated/resources/data/basemetals/recipe/lead_slab.json index 26d8b3299..882207cc5 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_slab.json +++ b/src/generated/resources/data/basemetals/recipe/lead_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_slab", "key": { - "X": { - "tag": "forge:storage_blocks/lead" - } + "X": "#forge:storage_blocks/lead" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/lead_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_slab_recycling.json index 4940ac681..8acde27b0 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:lead_slab" - }, + "ingredient": "basemetals:lead_slab", "result": { "count": 4, "id": "basemetals:lead_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/lead_smallpowder.json b/src/generated/resources/data/basemetals/recipe/lead_smallpowder.json index 1d6900a04..6a18bb8ec 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/lead_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:lead_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/lead" - } + "#forge:dusts/lead" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/lead_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/lead_smallpowder_smelting.json index bd56b3348..5563e361e 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/lead_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/lead" - }, + "ingredient": "#forge:tiny_dusts/lead", "result": { "id": "basemetals:lead_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/lead_stairs.json b/src/generated/resources/data/basemetals/recipe/lead_stairs.json index c45d531bf..f657d8518 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/lead_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/lead" - } + "X": "#forge:storage_blocks/lead" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/lead_sword.json b/src/generated/resources/data/basemetals/recipe/lead_sword.json index c2877cd50..3c0d6d61e 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_sword.json +++ b/src/generated/resources/data/basemetals/recipe/lead_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:lead_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/lead" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/lead" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/lead_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_sword_recycling.json index f9252457d..0beafee40 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_sword" - }, + "ingredient": "basemetals:lead_sword", "result": { "count": 2, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_trapdoor.json b/src/generated/resources/data/basemetals/recipe/lead_trapdoor.json index 2b5169245..70c00f192 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/lead_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_trapdoor", "key": { - "X": { - "tag": "forge:ingots/lead" - } + "X": "#forge:ingots/lead" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_trapdoor_recycling.json index 282703d28..37324be4f 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:lead_trapdoor" - }, + "ingredient": "basemetals:lead_trapdoor", "result": { "count": 4, "id": "basemetals:lead_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/lead_wall.json b/src/generated/resources/data/basemetals/recipe/lead_wall.json index 7800df34e..372d83ff2 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_wall.json +++ b/src/generated/resources/data/basemetals/recipe/lead_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:lead_wall", "key": { - "X": { - "tag": "forge:storage_blocks/lead" - } + "X": "#forge:storage_blocks/lead" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/lead_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/lead_wall_recycling.json index 553156f03..7186a9eb4 100644 --- a/src/generated/resources/data/basemetals/recipe/lead_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/lead_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:lead_wall" - }, + "ingredient": "basemetals:lead_wall", "result": { "id": "basemetals:lead_block" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json index ab24ec424..d92656c7e 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/mercury" - }, + "ingredient": "#forge:ingots/mercury", "result": { "id": "basemetals:mercury_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/mercury_ingot_from_nuggets.json index fb5512b19..b7faf9531 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mercury_ingot", "key": { - "X": { - "tag": "forge:nuggets/mercury" - } + "X": "#forge:nuggets/mercury" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json index f989ae89c..74173d2bc 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/mercury" - }, + "ingredient": "#forge:nuggets/mercury", "result": { "id": "basemetals:mercury_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_nuggets.json b/src/generated/resources/data/basemetals/recipe/mercury_nuggets.json index 3a2875498..64646578c 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mercury_nugget", "ingredients": [ - { - "tag": "forge:ingots/mercury" - } + "#forge:ingots/mercury" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_blasting.json index 8daf96f62..d0d1edfc6 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/mercury" - }, + "ingredient": "#forge:ores/mercury", "result": { "id": "basemetals:mercury_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json index caf7200c3..7319a153c 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/mercury" - }, + "ingredient": "#forge:ores/mercury", "result": { "count": 2, "id": "basemetals:mercury_powder" diff --git a/src/generated/resources/data/basemetals/recipe/mercury_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_ore_smelting.json index be40f895f..664831259 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/mercury" - }, + "ingredient": "#forge:ores/mercury", "result": { "id": "basemetals:mercury_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/mercury_powder_from_small.json index 5f3ac821d..a1312ec98 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mercury_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/mercury" - } + "X": "#forge:tiny_dusts/mercury" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mercury_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_powder_smelting.json index 031ded017..1aad81f24 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/mercury" - }, + "ingredient": "#forge:dusts/mercury", "result": { "id": "basemetals:mercury_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_blasting.json index aba7af40d..4c2906171 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/mercury" - }, + "ingredient": "#forge:raw_materials/mercury", "result": { "id": "basemetals:mercury_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json index c7ee65c2d..a9f201414 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/mercury" - }, + "ingredient": "#forge:raw_materials/mercury", "result": { "id": "basemetals:mercury_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_raw_smelting.json index fbc5095f2..3098f1ac9 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/mercury" - }, + "ingredient": "#forge:raw_materials/mercury", "result": { "id": "basemetals:mercury_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mercury_smallpowder.json b/src/generated/resources/data/basemetals/recipe/mercury_smallpowder.json index 03d311461..570279860 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mercury_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/mercury" - } + "#forge:dusts/mercury" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/mercury_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/mercury_smallpowder_smelting.json index 7a73e9cc7..7b956972f 100644 --- a/src/generated/resources/data/basemetals/recipe/mercury_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mercury_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/mercury" - }, + "ingredient": "#forge:tiny_dusts/mercury", "result": { "id": "basemetals:mercury_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/minecart.json b/src/generated/resources/data/basemetals/recipe/minecart.json index 485a15547..83b38c079 100644 --- a/src/generated/resources/data/basemetals/recipe/minecart.json +++ b/src/generated/resources/data/basemetals/recipe/minecart.json @@ -5,9 +5,7 @@ "category": "misc", "group": "minecraft:minecart", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_arrow.json b/src/generated/resources/data/basemetals/recipe/mithril_arrow.json index 6dfc01390..9eb2dd6b0 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:mithril_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/mithril" - }, - "R": { - "tag": "forge:rods/mithril" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/mithril", + "R": "#forge:rods/mithril" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_arrow_recycling.json index a169c06a4..40d23a564 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:mithril_arrow" - }, + "ingredient": "basemetals:mithril_arrow", "result": { "id": "basemetals:mithril_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_axe.json b/src/generated/resources/data/basemetals/recipe/mithril_axe.json index 2c94fb301..68673f6d6 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_axe.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/mithril" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_axe_recycling.json index 633827a6b..a423114d5 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_axe" - }, + "ingredient": "basemetals:mithril_axe", "result": { "count": 3, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bars.json b/src/generated/resources/data/basemetals/recipe/mithril_bars.json index 1e3824760..ebb7948ea 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bars.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_bars", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bars_2.json b/src/generated/resources/data/basemetals/recipe/mithril_bars_2.json index ec9fd39e9..e50b61e34 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_bars", "key": { - "X": { - "tag": "forge:rods/mithril" - } + "X": "#forge:rods/mithril" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_bars_recycling.json index 00c377dd8..d3af29d0b 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:mithril_bars" - }, + "ingredient": "basemetals:mithril_bars", "result": { "count": 3, "id": "basemetals:mithril_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_blend.json b/src/generated/resources/data/basemetals/recipe/mithril_blend.json index fc8c06f71..503779b58 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_blend.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_blend.json @@ -5,18 +5,10 @@ "category": "misc", "group": "basemetals:mithril_blend", "ingredients": [ - { - "tag": "forge:dusts/silver" - }, - { - "tag": "forge:dusts/silver" - }, - { - "tag": "forge:dusts/coldiron" - }, - { - "tag": "forge:ingots/mercury" - } + "#forge:dusts/silver", + "#forge:dusts/silver", + "#forge:dusts/coldiron", + "#forge:ingots/mercury" ], "result": { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipe/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/mithril_blend_from_small.json index f6f950336..7871e9c7b 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_blend", "key": { - "X": { - "tag": "forge:small_blends/mithril" - } + "X": "#forge:small_blends/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_blend_smelting.json index 8478f6708..a36b9cc30 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "tag": "forge:blends/mithril" - }, + "ingredient": "#forge:blends/mithril", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_block.json b/src/generated/resources/data/basemetals/recipe/mithril_block.json index caaa3e196..80447d2e6 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_block.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_block", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json index cd1af4a9e..616d7de5b 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/mithril" - }, + "ingredient": "#forge:storage_blocks/mithril", "result": { "count": 9, "id": "basemetals:mithril_powder" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_block_ingot.json b/src/generated/resources/data/basemetals/recipe/mithril_block_ingot.json index c5a7c89dd..28fcabf03 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/mithril" - } + "#forge:storage_blocks/mithril" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bolt.json b/src/generated/resources/data/basemetals/recipe/mithril_bolt.json index 20d5da221..02ee7dd2f 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/mithril" - } + "F": "minecraft:feather", + "R": "#forge:rods/mithril" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_bolt_recycling.json index 09556c46a..aedaa0947 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:mithril_bolt" - }, + "ingredient": "basemetals:mithril_bolt", "result": { "count": 2, "id": "basemetals:mithril_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_boots.json b/src/generated/resources/data/basemetals/recipe/mithril_boots.json index 5003a54d3..95e31ed8b 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_boots.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:mithril_boots", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_boots_recycling.json index 21f654eeb..0adecf1ee 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_boots" - }, + "ingredient": "basemetals:mithril_boots", "result": { "count": 4, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bow.json b/src/generated/resources/data/basemetals/recipe/mithril_bow.json index d6c01e41f..a7b0d6bc4 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bow.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_bow", "key": { - "R": { - "tag": "forge:rods/mithril" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/mithril", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_bow_recycling.json index 23df4ec27..fc72230d5 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_bow" - }, + "ingredient": "basemetals:mithril_bow", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_button.json b/src/generated/resources/data/basemetals/recipe/mithril_button.json index 8f80a5e87..0bf0d91c8 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_button.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_button", "key": { - "X": { - "tag": "forge:nuggets/mithril" - } + "X": "#forge:nuggets/mithril" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_button_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_button_recycling.json index 91f3fbba9..842c5ecb5 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:mithril_button" - }, + "ingredient": "basemetals:mithril_button", "result": { "count": 2, "id": "basemetals:mithril_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_chestplate.json b/src/generated/resources/data/basemetals/recipe/mithril_chestplate.json index d7fb601f4..7de6894a9 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:mithril_chestplate", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_chestplate_recycling.json index 7ca1e9782..2f6bf049e 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_chestplate" - }, + "ingredient": "basemetals:mithril_chestplate", "result": { "count": 8, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_crackhammer.json b/src/generated/resources/data/basemetals/recipe/mithril_crackhammer.json index fa78ff44c..a14c101dd 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/mithril" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_crackhammer_recycling.json index 1e242aa8d..e2b7c10bd 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:mithril_crackhammer" - }, + "ingredient": "basemetals:mithril_crackhammer", "result": { "id": "basemetals:mithril_block" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_crossbow.json b/src/generated/resources/data/basemetals/recipe/mithril_crossbow.json index b179b225f..1a464fdb4 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:mithril_crossbow", "key": { - "G": { - "tag": "forge:gears/mithril" - }, - "R": { - "tag": "forge:rods/mithril" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/mithril", + "R": "#forge:rods/mithril", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_crossbow_recycling.json index 1cd29f453..47aaaf465 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_crossbow" - }, + "ingredient": "basemetals:mithril_crossbow", "result": { "count": 4, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_door.json b/src/generated/resources/data/basemetals/recipe/mithril_door.json index 5446bc80a..345473810 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_door.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_door", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_door_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_door_recycling.json index 46b9bf029..0bcc1d956 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_door" - }, + "ingredient": "basemetals:mithril_door", "result": { "count": 2, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_fishingrod.json b/src/generated/resources/data/basemetals/recipe/mithril_fishingrod.json index 06e6d8bed..e6e29f1e7 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_fishing_rod", "key": { - "R": { - "tag": "forge:rods/mithril" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/mithril", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_gear.json b/src/generated/resources/data/basemetals/recipe/mithril_gear.json index 533c86596..bc84b6210 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_gear.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:mithril_gear", "key": { - "R": { - "tag": "forge:rods/mithril" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "R": "#forge:rods/mithril", + "X": "#forge:ingots/mithril" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_gear_recycling.json index 259115ed8..ce8cf53fb 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_gear" - }, + "ingredient": "basemetals:mithril_gear", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_helmet.json b/src/generated/resources/data/basemetals/recipe/mithril_helmet.json index 6ed6edc7b..c342fb293 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:mithril_helmet", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_helmet_recycling.json index fa5cceb86..70ca5a5b2 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_helmet" - }, + "ingredient": "basemetals:mithril_helmet", "result": { "count": 5, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_hoe.json b/src/generated/resources/data/basemetals/recipe/mithril_hoe.json index c0a3ffccc..0ed0c8236 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/mithril" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_hoe_recycling.json index 33d623e3c..28f195d1f 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_hoe" - }, + "ingredient": "basemetals:mithril_hoe", "result": { "count": 2, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_horsearmor.json b/src/generated/resources/data/basemetals/recipe/mithril_horsearmor.json index 806a3a3a0..dab1450d8 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/mithril" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json index 1b88b0c91..41254912c 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/mithril" - }, + "ingredient": "#forge:ingots/mithril", "result": { "id": "basemetals:mithril_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/mithril_ingot_from_nuggets.json index 89dfe80b9..d1623e381 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_ingot", "key": { - "X": { - "tag": "forge:nuggets/mithril" - } + "X": "#forge:nuggets/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_leggings.json b/src/generated/resources/data/basemetals/recipe/mithril_leggings.json index 29c57d27c..caac10402 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:mithril_leggings", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_leggings_recycling.json index 9cd3ac717..105604128 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_leggings" - }, + "ingredient": "basemetals:mithril_leggings", "result": { "count": 7, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_lever.json b/src/generated/resources/data/basemetals/recipe/mithril_lever.json index 76f8a3175..2d08fcc0a 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_lever.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:mithril_lever", "key": { - "R": { - "tag": "forge:rods/mithril" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "R": "#forge:rods/mithril", + "X": "#forge:ingots/mithril" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_lever_recycling.json index c15e7c12e..cf5fe4b8b 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_lever" - }, + "ingredient": "basemetals:mithril_lever", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json index ab3cde062..78b569210 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/mithril" - }, + "ingredient": "#forge:nuggets/mithril", "result": { "id": "basemetals:mithril_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_nuggets.json b/src/generated/resources/data/basemetals/recipe/mithril_nuggets.json index 233e6eb0a..d457f8781 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_nugget", "ingredients": [ - { - "tag": "forge:ingots/mithril" - } + "#forge:ingots/mithril" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/mithril_pickaxe.json b/src/generated/resources/data/basemetals/recipe/mithril_pickaxe.json index b9d8b3a03..259f5f922 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_pickaxe_recycling.json index 1beb12945..198e23f7e 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_pickaxe" - }, + "ingredient": "basemetals:mithril_pickaxe", "result": { "count": 3, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_plate.json b/src/generated/resources/data/basemetals/recipe/mithril_plate.json index 4bbacd8f4..81f20558b 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_plate.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_plate", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_plate_recycling.json index 1ac9ae9dc..544e2f823 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_plate" - }, + "ingredient": "basemetals:mithril_plate", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/mithril_powder_from_small.json index 82c3be821..2a8ce0721 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/mithril" - } + "X": "#forge:tiny_dusts/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_powder_smelting.json index 2bb674f97..5bd0e561d 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "tag": "forge:dusts/mithril" - }, + "ingredient": "#forge:dusts/mithril", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate.json index cb811ff0c..dc1b519d2 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate_recycling.json index 8ccc417f6..8f44a703a 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_pressure_plate" - }, + "ingredient": "basemetals:mithril_pressure_plate", "result": { "count": 2, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_rod.json b/src/generated/resources/data/basemetals/recipe/mithril_rod.json index 714d2aef8..5f93584ee 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_rod.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_rod", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_rod_recycling.json index 1ad4cd24a..baf12f54e 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:mithril_rod" - }, + "ingredient": "basemetals:mithril_rod", "result": { "count": 4, "id": "basemetals:mithril_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_scythe.json b/src/generated/resources/data/basemetals/recipe/mithril_scythe.json index 094f4aa4d..2435a9886 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/mithril" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_shears.json b/src/generated/resources/data/basemetals/recipe/mithril_shears.json index a10f61a38..6a49b0561 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_shears.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:mithril_shears", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_shears_recycling.json index e9b9ddd87..d924b5548 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_shears" - }, + "ingredient": "basemetals:mithril_shears", "result": { "count": 2, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_shield.json b/src/generated/resources/data/basemetals/recipe/mithril_shield.json index 83c0a0d58..9685673d3 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_shield.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/mithril" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_shovel.json b/src/generated/resources/data/basemetals/recipe/mithril_shovel.json index d1ceef9e8..40748ebe8 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/mithril" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_shovel_recycling.json index ac5f2cce5..b185df391 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_shovel" - }, + "ingredient": "basemetals:mithril_shovel", "result": { "id": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_slab.json b/src/generated/resources/data/basemetals/recipe/mithril_slab.json index e94e0dfde..e9d4e5d96 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_slab.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_slab", "key": { - "X": { - "tag": "forge:storage_blocks/mithril" - } + "X": "#forge:storage_blocks/mithril" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_slab_recycling.json index 011439f91..ebc61d8ca 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:mithril_slab" - }, + "ingredient": "basemetals:mithril_slab", "result": { "count": 4, "id": "basemetals:mithril_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_smallblend.json b/src/generated/resources/data/basemetals/recipe/mithril_smallblend.json index d1113f2df..c7f08c44f 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_smallblend", "ingredients": [ - { - "tag": "forge:blends/mithril" - } + "#forge:blends/mithril" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/mithril_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_smallblend_smelting.json index 4a20ab8db..c55ef9749 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:small_blends/mithril" - }, + "ingredient": "#forge:small_blends/mithril", "result": { "id": "basemetals:mithril_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_smallpowder.json b/src/generated/resources/data/basemetals/recipe/mithril_smallpowder.json index 258a08247..299406c46 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:mithril_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/mithril" - } + "#forge:dusts/mithril" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/mithril_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/mithril_smallpowder_smelting.json index a0bb415cb..710725959 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:tiny_dusts/mithril" - }, + "ingredient": "#forge:tiny_dusts/mithril", "result": { "id": "basemetals:mithril_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/mithril_stairs.json b/src/generated/resources/data/basemetals/recipe/mithril_stairs.json index 0a03d8971..0806a2470 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/mithril" - } + "X": "#forge:storage_blocks/mithril" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_sword.json b/src/generated/resources/data/basemetals/recipe/mithril_sword.json index cdd541c35..c59307cbe 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_sword.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:mithril_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/mithril" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/mithril" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_sword_recycling.json index ead40fd81..9eb43ff3c 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_sword" - }, + "ingredient": "basemetals:mithril_sword", "result": { "count": 2, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_trapdoor.json b/src/generated/resources/data/basemetals/recipe/mithril_trapdoor.json index 83803b040..9fdcaf390 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_trapdoor", "key": { - "X": { - "tag": "forge:ingots/mithril" - } + "X": "#forge:ingots/mithril" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_trapdoor_recycling.json index ce6f4677e..e7baaec62 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.9, - "ingredient": { - "item": "basemetals:mithril_trapdoor" - }, + "ingredient": "basemetals:mithril_trapdoor", "result": { "count": 4, "id": "basemetals:mithril_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/mithril_wall.json b/src/generated/resources/data/basemetals/recipe/mithril_wall.json index c1b40905f..1408bfa71 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_wall.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:mithril_wall", "key": { - "X": { - "tag": "forge:storage_blocks/mithril" - } + "X": "#forge:storage_blocks/mithril" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/mithril_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/mithril_wall_recycling.json index 32c9ce5f1..2219c51f9 100644 --- a/src/generated/resources/data/basemetals/recipe/mithril_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/mithril_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:mithril_wall" - }, + "ingredient": "basemetals:mithril_wall", "result": { "id": "basemetals:mithril_block" } diff --git a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json index 3898179ed..62434ddd1 100644 --- a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:mossy_cobblestone" - }, + "ingredient": "minecraft:mossy_cobblestone", "result": { "id": "minecraft:gravel" } diff --git a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json index 768e33dd7..e6d473957 100644 --- a/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/mossy_cobblestone_wall_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:mossy_cobblestone_wall" - }, + "ingredient": "minecraft:mossy_cobblestone_wall", "result": { "id": "minecraft:gravel" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_arrow.json b/src/generated/resources/data/basemetals/recipe/nickel_arrow.json index b658b728d..9670e86f3 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:nickel_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/nickel" - }, - "R": { - "tag": "forge:rods/nickel" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/nickel", + "R": "#forge:rods/nickel" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_arrow_recycling.json index a8c062d96..a57e81e48 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:nickel_arrow" - }, + "ingredient": "basemetals:nickel_arrow", "result": { "id": "basemetals:nickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_axe.json b/src/generated/resources/data/basemetals/recipe/nickel_axe.json index 2b579866a..6a60038a0 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_axe.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/nickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_axe_recycling.json index c99e5a5b5..45fd71ddd 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_axe" - }, + "ingredient": "basemetals:nickel_axe", "result": { "count": 3, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bars.json b/src/generated/resources/data/basemetals/recipe/nickel_bars.json index 7d925109b..009b67ae2 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bars.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_bars", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bars_2.json b/src/generated/resources/data/basemetals/recipe/nickel_bars_2.json index f21f01ea3..7d47e6f51 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_bars", "key": { - "X": { - "tag": "forge:rods/nickel" - } + "X": "#forge:rods/nickel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_bars_recycling.json index 9290ffc36..f8b54b2ce 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:nickel_bars" - }, + "ingredient": "basemetals:nickel_bars", "result": { "count": 3, "id": "basemetals:nickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_block.json b/src/generated/resources/data/basemetals/recipe/nickel_block.json index e47e0678d..18de9bc01 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_block.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_block", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json index 7539a3f29..afeb27cea 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/nickel" - }, + "ingredient": "#forge:storage_blocks/nickel", "result": { "count": 9, "id": "basemetals:nickel_powder" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/nickel_block_ingot.json index cd384d94e..5b48baf0e 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:nickel_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/nickel" - } + "#forge:storage_blocks/nickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bolt.json b/src/generated/resources/data/basemetals/recipe/nickel_bolt.json index b9b0c9a87..7e4ea5521 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/nickel" - } + "F": "minecraft:feather", + "R": "#forge:rods/nickel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_bolt_recycling.json index 350de8813..b70321fd9 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:nickel_bolt" - }, + "ingredient": "basemetals:nickel_bolt", "result": { "count": 2, "id": "basemetals:nickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_boots.json b/src/generated/resources/data/basemetals/recipe/nickel_boots.json index d1dd53939..b10e0be05 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_boots.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:nickel_boots", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_boots_plate_repair.json index 4d96d1692..721de6ffa 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/nickel" - }, + "plate": "#forge:plates/nickel", "target": "basemetals:nickel_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_boots_recycling.json index 87e2741f5..2328bb313 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_boots" - }, + "ingredient": "basemetals:nickel_boots", "result": { "count": 4, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bow.json b/src/generated/resources/data/basemetals/recipe/nickel_bow.json index 2aea110e2..ca7d70c1f 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bow.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_bow", "key": { - "R": { - "tag": "forge:rods/nickel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/nickel", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_bow_recycling.json index 99aa1ccda..30ef41524 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_bow" - }, + "ingredient": "basemetals:nickel_bow", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_button.json b/src/generated/resources/data/basemetals/recipe/nickel_button.json index 403b16f1d..dcf442c2c 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_button.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_button", "key": { - "X": { - "tag": "forge:nuggets/nickel" - } + "X": "#forge:nuggets/nickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_button_recycling.json index 175d835c6..56f139ad5 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:nickel_button" - }, + "ingredient": "basemetals:nickel_button", "result": { "count": 2, "id": "basemetals:nickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_chestplate.json b/src/generated/resources/data/basemetals/recipe/nickel_chestplate.json index 8c2e4ceec..4969ee5a4 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:nickel_chestplate", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_chestplate_plate_repair.json index 49105c12b..d5b5145d1 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/nickel" - }, + "plate": "#forge:plates/nickel", "target": "basemetals:nickel_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_chestplate_recycling.json index dac85b7ec..1bd636566 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_chestplate" - }, + "ingredient": "basemetals:nickel_chestplate", "result": { "count": 8, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/nickel_crackhammer.json index 5d11ca7c3..2ba443118 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/nickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_crackhammer_recycling.json index f6a75597c..ef3bc2dc5 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:nickel_crackhammer" - }, + "ingredient": "basemetals:nickel_crackhammer", "result": { "id": "basemetals:nickel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_crossbow.json b/src/generated/resources/data/basemetals/recipe/nickel_crossbow.json index b1d38051a..7ac496030 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:nickel_crossbow", "key": { - "G": { - "tag": "forge:gears/nickel" - }, - "R": { - "tag": "forge:rods/nickel" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/nickel", + "R": "#forge:rods/nickel", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_crossbow_recycling.json index 60aa07af9..443121743 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_crossbow" - }, + "ingredient": "basemetals:nickel_crossbow", "result": { "count": 4, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_door.json b/src/generated/resources/data/basemetals/recipe/nickel_door.json index d9dabc044..f4e957bf7 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_door.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_door", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_door_recycling.json index a2248b5c9..711598706 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_door" - }, + "ingredient": "basemetals:nickel_door", "result": { "count": 2, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/nickel_fishingrod.json index 6e7c45fe4..c436640a6 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_fishing_rod", "key": { - "R": { - "tag": "forge:rods/nickel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/nickel", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_gear.json b/src/generated/resources/data/basemetals/recipe/nickel_gear.json index f4ad1a0a7..a0db93b3f 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_gear.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:nickel_gear", "key": { - "R": { - "tag": "forge:rods/nickel" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "R": "#forge:rods/nickel", + "X": "#forge:ingots/nickel" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_gear_recycling.json index 858229377..e83576018 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_gear" - }, + "ingredient": "basemetals:nickel_gear", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_helmet.json b/src/generated/resources/data/basemetals/recipe/nickel_helmet.json index b706a60e3..7297fd002 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:nickel_helmet", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_helmet_plate_repair.json index 55fc6c41c..8250320ed 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/nickel" - }, + "plate": "#forge:plates/nickel", "target": "basemetals:nickel_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_helmet_recycling.json index 3798c5a4c..6d8513ee9 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_helmet" - }, + "ingredient": "basemetals:nickel_helmet", "result": { "count": 5, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_hoe.json b/src/generated/resources/data/basemetals/recipe/nickel_hoe.json index c7fa8bd79..647ed7878 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/nickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_hoe_recycling.json index 429717067..a533b0924 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_hoe" - }, + "ingredient": "basemetals:nickel_hoe", "result": { "count": 2, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/nickel_horsearmor.json index 24a0c2041..bf2497e74 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/nickel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json index 51fe08a15..0e7facf44 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/nickel" - }, + "ingredient": "#forge:ingots/nickel", "result": { "id": "basemetals:nickel_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/nickel_ingot_from_nuggets.json index 979b7777c..c9dc34d27 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:nickel_ingot", "key": { - "X": { - "tag": "forge:nuggets/nickel" - } + "X": "#forge:nuggets/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_leggings.json b/src/generated/resources/data/basemetals/recipe/nickel_leggings.json index abbc2d93b..3f70b3294 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:nickel_leggings", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_leggings_plate_repair.json index 214b8577d..e62298e84 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/nickel" - }, + "plate": "#forge:plates/nickel", "target": "basemetals:nickel_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_leggings_recycling.json index 9dc2c5ada..f8ff61f6b 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_leggings" - }, + "ingredient": "basemetals:nickel_leggings", "result": { "count": 7, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_lever.json b/src/generated/resources/data/basemetals/recipe/nickel_lever.json index dd75d1f78..271b4b909 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_lever.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:nickel_lever", "key": { - "R": { - "tag": "forge:rods/nickel" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "R": "#forge:rods/nickel", + "X": "#forge:ingots/nickel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_lever_recycling.json index 173f9b4f0..278dc9058 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_lever" - }, + "ingredient": "basemetals:nickel_lever", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json index 96412b080..78561c67d 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/nickel" - }, + "ingredient": "#forge:nuggets/nickel", "result": { "id": "basemetals:nickel_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_nuggets.json b/src/generated/resources/data/basemetals/recipe/nickel_nuggets.json index 300de44d7..25d44982d 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:nickel_nugget", "ingredients": [ - { - "tag": "forge:ingots/nickel" - } + "#forge:ingots/nickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_blasting.json index 7ab2f79d2..bec360983 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "tag": "forge:ores/nickel" - }, + "ingredient": "#forge:ores/nickel", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json index d95fec3de..c8aaa3aeb 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/nickel" - }, + "ingredient": "#forge:ores/nickel", "result": { "count": 2, "id": "basemetals:nickel_powder" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_ore_smelting.json index 7f3d93fc1..9c833d8f8 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:ores/nickel" - }, + "ingredient": "#forge:ores/nickel", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/nickel_pickaxe.json index 181823739..23747eb48 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_pickaxe_recycling.json index f68cdef44..953f1172c 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_pickaxe" - }, + "ingredient": "basemetals:nickel_pickaxe", "result": { "count": 3, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_plate.json b/src/generated/resources/data/basemetals/recipe/nickel_plate.json index 12e1e3378..83d8462b3 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_plate.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_plate", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_plate_recycling.json index 2f403f985..b182f064d 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_plate" - }, + "ingredient": "basemetals:nickel_plate", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/nickel_powder_from_small.json index 5e268c4fc..9cad1d6b2 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:nickel_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/nickel" - } + "X": "#forge:tiny_dusts/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_powder_smelting.json index fa823f404..d6c596cdc 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:dusts/nickel" - }, + "ingredient": "#forge:dusts/nickel", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate.json index f4b598b67..c87e4f4ec 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate_recycling.json index cd0ae0864..9b77d43b5 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_pressure_plate" - }, + "ingredient": "basemetals:nickel_pressure_plate", "result": { "count": 2, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_blasting.json index 02b7e4a2c..60791d30b 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "tag": "forge:raw_materials/nickel" - }, + "ingredient": "#forge:raw_materials/nickel", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json index fda3fcd53..55748cf1e 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/nickel" - }, + "ingredient": "#forge:raw_materials/nickel", "result": { "id": "basemetals:nickel_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_raw_smelting.json index 4f36516ac..983f01e65 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "tag": "forge:raw_materials/nickel" - }, + "ingredient": "#forge:raw_materials/nickel", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_rod.json b/src/generated/resources/data/basemetals/recipe/nickel_rod.json index 86866a1ce..09e81b1d7 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_rod.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:nickel_rod", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_rod_recycling.json index 6d68d63fb..a572b7ab1 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:nickel_rod" - }, + "ingredient": "basemetals:nickel_rod", "result": { "count": 4, "id": "basemetals:nickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_scythe.json b/src/generated/resources/data/basemetals/recipe/nickel_scythe.json index c27b7adb8..8f98bc2dd 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/nickel" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_shears.json b/src/generated/resources/data/basemetals/recipe/nickel_shears.json index 23c7281d2..9b3d164b2 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_shears.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:nickel_shears", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_shears_recycling.json index 95b03ab6c..96a6bf8bb 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_shears" - }, + "ingredient": "basemetals:nickel_shears", "result": { "count": 2, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_shield.json b/src/generated/resources/data/basemetals/recipe/nickel_shield.json index cdde233c6..b3487a9e8 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_shield.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/nickel" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/nickel_shield_plate_repair.json index d77470624..0b3ad8bd5 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/nickel" - }, + "plate": "#forge:plates/nickel", "target": "basemetals:nickel_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/nickel_shovel.json b/src/generated/resources/data/basemetals/recipe/nickel_shovel.json index d93c03879..ca1ec48a0 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/nickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_shovel_recycling.json index 6afaeadbe..2adfd727d 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_shovel" - }, + "ingredient": "basemetals:nickel_shovel", "result": { "id": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_slab.json b/src/generated/resources/data/basemetals/recipe/nickel_slab.json index d2dd2bc4c..6b85ec4f7 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_slab.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_slab", "key": { - "X": { - "tag": "forge:storage_blocks/nickel" - } + "X": "#forge:storage_blocks/nickel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_slab_recycling.json index 78d4b4231..df4a51a26 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "basemetals:nickel_slab" - }, + "ingredient": "basemetals:nickel_slab", "result": { "count": 4, "id": "basemetals:nickel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/nickel_smallpowder.json index 2a12a1837..2e3037286 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:nickel_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/nickel" - } + "#forge:dusts/nickel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/nickel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/nickel_smallpowder_smelting.json index 2235301f9..7813c35d1 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "tag": "forge:tiny_dusts/nickel" - }, + "ingredient": "#forge:tiny_dusts/nickel", "result": { "id": "basemetals:nickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/nickel_stairs.json b/src/generated/resources/data/basemetals/recipe/nickel_stairs.json index 00dd4ed1c..1bb8833c4 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/nickel" - } + "X": "#forge:storage_blocks/nickel" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_sword.json b/src/generated/resources/data/basemetals/recipe/nickel_sword.json index 5d849dfa1..b245fe8d7 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_sword.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:nickel_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/nickel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/nickel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_sword_recycling.json index c88beb722..ca53af29d 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_sword" - }, + "ingredient": "basemetals:nickel_sword", "result": { "count": 2, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/nickel_trapdoor.json index 5e2b63482..fd039b0d2 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_trapdoor", "key": { - "X": { - "tag": "forge:ingots/nickel" - } + "X": "#forge:ingots/nickel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_trapdoor_recycling.json index b331ff37f..c60dc1b67 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "basemetals:nickel_trapdoor" - }, + "ingredient": "basemetals:nickel_trapdoor", "result": { "count": 4, "id": "basemetals:nickel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/nickel_wall.json b/src/generated/resources/data/basemetals/recipe/nickel_wall.json index 12f245fd6..cdc28f722 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_wall.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:nickel_wall", "key": { - "X": { - "tag": "forge:storage_blocks/nickel" - } + "X": "#forge:storage_blocks/nickel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/nickel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/nickel_wall_recycling.json index 4348779ec..a5e888e4a 100644 --- a/src/generated/resources/data/basemetals/recipe/nickel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/nickel_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:nickel_wall" - }, + "ingredient": "basemetals:nickel_wall", "result": { "id": "basemetals:nickel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_arrow.json b/src/generated/resources/data/basemetals/recipe/obsidian_arrow.json index 6a97cf228..894cd5573 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:obsidian_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/obsidian" - }, - "R": { - "tag": "forge:rods/obsidian" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/obsidian", + "R": "#forge:rods/obsidian" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_arrow_recycling.json index 694398bc8..49c9107f5 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:obsidian_arrow" - }, + "ingredient": "basemetals:obsidian_arrow", "result": { "id": "basemetals:obsidian_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_axe.json b/src/generated/resources/data/basemetals/recipe/obsidian_axe.json index 97499caf4..eedb4bdf5 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_axe.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/obsidian" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_axe_recycling.json index a3a5ae62c..3989523db 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_axe" - }, + "ingredient": "basemetals:obsidian_axe", "result": { "count": 3, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bars.json b/src/generated/resources/data/basemetals/recipe/obsidian_bars.json index 735c5e21b..207963b2c 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bars.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_bars", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bars_2.json b/src/generated/resources/data/basemetals/recipe/obsidian_bars_2.json index 0886f272f..c507c0e27 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_bars", "key": { - "X": { - "tag": "forge:rods/obsidian" - } + "X": "#forge:rods/obsidian" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_bars_recycling.json index 0f772ee4d..68f6d1d5d 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:obsidian_bars" - }, + "ingredient": "basemetals:obsidian_bars", "result": { "count": 3, "id": "basemetals:obsidian_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_block.json b/src/generated/resources/data/basemetals/recipe/obsidian_block.json index cb7b63d5f..218d252a1 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_block.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:obsidian", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bolt.json b/src/generated/resources/data/basemetals/recipe/obsidian_bolt.json index 8802f1d78..99b61f189 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/obsidian" - } + "F": "minecraft:feather", + "R": "#forge:rods/obsidian" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_bolt_recycling.json index 93af15882..d1b3f6ff8 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:obsidian_bolt" - }, + "ingredient": "basemetals:obsidian_bolt", "result": { "count": 2, "id": "basemetals:obsidian_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_boots.json b/src/generated/resources/data/basemetals/recipe/obsidian_boots.json index 2e9ce9c6c..162e83ddf 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_boots.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:obsidian_boots", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_boots_recycling.json index e02482cfe..f43d15c5d 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_boots" - }, + "ingredient": "basemetals:obsidian_boots", "result": { "count": 4, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bow.json b/src/generated/resources/data/basemetals/recipe/obsidian_bow.json index 5213c5e8d..ed6495ee5 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bow.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_bow", "key": { - "R": { - "tag": "forge:rods/obsidian" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/obsidian", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_bow_recycling.json index 6ac4e7747..600fedbff 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_bow" - }, + "ingredient": "basemetals:obsidian_bow", "result": { "id": "basemetals:obsidian_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_button.json b/src/generated/resources/data/basemetals/recipe/obsidian_button.json index b887c115f..931e2e765 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_button.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_button", "key": { - "X": { - "tag": "forge:nuggets/obsidian" - } + "X": "#forge:nuggets/obsidian" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_button_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_button_recycling.json index d46accf9b..cd28f2e43 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:obsidian_button" - }, + "ingredient": "basemetals:obsidian_button", "result": { "count": 2, "id": "basemetals:obsidian_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_chestplate.json b/src/generated/resources/data/basemetals/recipe/obsidian_chestplate.json index 83c60086d..92559ac35 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:obsidian_chestplate", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_chestplate_recycling.json index 2738e51ee..92fe7d5d1 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_chestplate" - }, + "ingredient": "basemetals:obsidian_chestplate", "result": { "count": 8, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer.json index b04a0c82d..6000c0b11 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/obsidian" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer_recycling.json index 5d077ffff..a3e277182 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:obsidian_crackhammer" - }, + "ingredient": "basemetals:obsidian_crackhammer", "result": { "id": "minecraft:obsidian" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_crossbow.json b/src/generated/resources/data/basemetals/recipe/obsidian_crossbow.json index 92f60179f..375131012 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:obsidian_crossbow", "key": { - "G": { - "tag": "forge:gears/obsidian" - }, - "R": { - "tag": "forge:rods/obsidian" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/obsidian", + "R": "#forge:rods/obsidian", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_crossbow_recycling.json index ade06ebab..15e87e275 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_crossbow" - }, + "ingredient": "basemetals:obsidian_crossbow", "result": { "count": 4, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json index d47fce148..6847475cd 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:obsidian" - }, + "ingredient": "minecraft:obsidian", "result": { "count": 4, "id": "basemetals:obsidian_powder" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_door.json b/src/generated/resources/data/basemetals/recipe/obsidian_door.json index 902383bd5..9d6e91d25 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_door.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_door", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_door_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_door_recycling.json index 8ea428e23..ecf9c0ac9 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_door" - }, + "ingredient": "basemetals:obsidian_door", "result": { "count": 2, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/recipe/obsidian_fishingrod.json index 8c113833b..e6543a9de 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_fishing_rod", "key": { - "R": { - "tag": "forge:rods/obsidian" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/obsidian", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_gear.json b/src/generated/resources/data/basemetals/recipe/obsidian_gear.json index 183d8c403..6bd5e4720 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_gear.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:obsidian_gear", "key": { - "R": { - "tag": "forge:rods/obsidian" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "R": "#forge:rods/obsidian", + "X": "#forge:ingots/obsidian" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_gear_recycling.json index edec3df74..1d7814f3e 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_gear" - }, + "ingredient": "basemetals:obsidian_gear", "result": { "id": "basemetals:obsidian_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_helmet.json b/src/generated/resources/data/basemetals/recipe/obsidian_helmet.json index 6bb9754d6..6fe28e5de 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:obsidian_helmet", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_helmet_recycling.json index 38a7cb5ac..da836ec79 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_helmet" - }, + "ingredient": "basemetals:obsidian_helmet", "result": { "count": 5, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_hoe.json b/src/generated/resources/data/basemetals/recipe/obsidian_hoe.json index cba308fa8..a4a0fd6b8 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/obsidian" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_hoe_recycling.json index d394cef33..ac6ddb842 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_hoe" - }, + "ingredient": "basemetals:obsidian_hoe", "result": { "count": 2, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/recipe/obsidian_horsearmor.json index 1a319cbeb..bee96f334 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/obsidian" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_ingot.json b/src/generated/resources/data/basemetals/recipe/obsidian_ingot.json index c146c13c6..42a8ebd5f 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:obsidian_ingot", "key": { - "X": { - "tag": "forge:nuggets/obsidian" - } + "X": "#forge:nuggets/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json index bbd5fa35b..aef34efeb 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/obsidian" - }, + "ingredient": "#forge:ingots/obsidian", "result": { "id": "basemetals:obsidian_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_leggings.json b/src/generated/resources/data/basemetals/recipe/obsidian_leggings.json index a08b7ec98..46cf7fb84 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:obsidian_leggings", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_leggings_recycling.json index 3bf19af2f..4d413c9de 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_leggings" - }, + "ingredient": "basemetals:obsidian_leggings", "result": { "count": 7, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_lever.json b/src/generated/resources/data/basemetals/recipe/obsidian_lever.json index 365d412b1..1f1c55f8e 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_lever.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:obsidian_lever", "key": { - "R": { - "tag": "forge:rods/obsidian" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "R": "#forge:rods/obsidian", + "X": "#forge:ingots/obsidian" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_lever_recycling.json index 09f63e04e..9a1e485ba 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_lever" - }, + "ingredient": "basemetals:obsidian_lever", "result": { "id": "basemetals:obsidian_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_nugget.json b/src/generated/resources/data/basemetals/recipe/obsidian_nugget.json index b7c7afbd8..a7b0e2516 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_nugget.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_nugget.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:obsidian_nugget", "ingredients": [ - { - "tag": "forge:ingots/obsidian" - } + "#forge:ingots/obsidian" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json index fb766c919..6e2b2160b 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/obsidian" - }, + "ingredient": "#forge:nuggets/obsidian", "result": { "id": "basemetals:obsidian_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe.json index 561b1968e..4f2647d4a 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe_recycling.json index 810985422..eaad7767a 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_pickaxe" - }, + "ingredient": "basemetals:obsidian_pickaxe", "result": { "count": 3, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/obsidian_powder_from_small.json index 2d3a5d18e..da29641d9 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:obsidian_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/obsidian" - } + "X": "#forge:tiny_dusts/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/obsidian_powder_smelting.json index 92e03da94..87fe24014 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "tag": "forge:dusts/obsidian" - }, + "ingredient": "#forge:dusts/obsidian", "result": { "id": "basemetals:obsidian_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate.json index d786de3f3..179fcb892 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate_recycling.json index 212daf8c2..e82602554 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_pressure_plate" - }, + "ingredient": "basemetals:obsidian_pressure_plate", "result": { "count": 2, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_rod.json b/src/generated/resources/data/basemetals/recipe/obsidian_rod.json index f7033846f..6916b4c73 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_rod.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:obsidian_rod", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_rod_recycling.json index 73bb15ffe..e9c22461c 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:obsidian_rod" - }, + "ingredient": "basemetals:obsidian_rod", "result": { "count": 4, "id": "basemetals:obsidian_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_scythe.json b/src/generated/resources/data/basemetals/recipe/obsidian_scythe.json index a4b59e29a..6fdb24843 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/obsidian" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_shears.json b/src/generated/resources/data/basemetals/recipe/obsidian_shears.json index 6331b2164..11d216d2f 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_shears.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:obsidian_shears", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_shears_recycling.json index 4362ad7eb..ffa7f967c 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_shears" - }, + "ingredient": "basemetals:obsidian_shears", "result": { "count": 2, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_shield.json b/src/generated/resources/data/basemetals/recipe/obsidian_shield.json index 3979077b9..c3910cf99 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_shield.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/obsidian" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_shovel.json b/src/generated/resources/data/basemetals/recipe/obsidian_shovel.json index 3ddb292b7..e0671f64c 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/obsidian" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_shovel_recycling.json index 2398f661c..3114c56c1 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_shovel" - }, + "ingredient": "basemetals:obsidian_shovel", "result": { "id": "basemetals:obsidian_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_slab.json b/src/generated/resources/data/basemetals/recipe/obsidian_slab.json index 4080a37bb..58a6382e3 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_slab.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_slab", "key": { - "X": { - "tag": "forge:storage_blocks/obsidian" - } + "X": "#forge:storage_blocks/obsidian" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_slab_recycling.json index 86605c294..911a65fc7 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "item": "basemetals:obsidian_slab" - }, + "ingredient": "basemetals:obsidian_slab", "result": { "count": 4, "id": "basemetals:obsidian_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder.json index ffb130f54..cf8be3d73 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:obsidian_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/obsidian" - } + "#forge:dusts/obsidian" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder_smelting.json index 0081eed47..e98faeb38 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.04, - "ingredient": { - "tag": "forge:tiny_dusts/obsidian" - }, + "ingredient": "#forge:tiny_dusts/obsidian", "result": { "id": "basemetals:obsidian_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_stairs.json b/src/generated/resources/data/basemetals/recipe/obsidian_stairs.json index e0d3050f0..444b28b6b 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/obsidian" - } + "X": "#forge:storage_blocks/obsidian" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_sword.json b/src/generated/resources/data/basemetals/recipe/obsidian_sword.json index c632455cb..76317af28 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_sword.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:obsidian_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/obsidian" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/obsidian" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_sword_recycling.json index d4d9977d8..fbb795ade 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_sword" - }, + "ingredient": "basemetals:obsidian_sword", "result": { "count": 2, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor.json index 5a6769a0d..5eeb3f61a 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_trapdoor", "key": { - "X": { - "tag": "forge:ingots/obsidian" - } + "X": "#forge:ingots/obsidian" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor_recycling.json index 8420354d3..361d2e0c0 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.4, - "ingredient": { - "item": "basemetals:obsidian_trapdoor" - }, + "ingredient": "basemetals:obsidian_trapdoor", "result": { "count": 4, "id": "basemetals:obsidian_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_wall.json b/src/generated/resources/data/basemetals/recipe/obsidian_wall.json index 55fdad404..9d0406d03 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_wall.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:obsidian_wall", "key": { - "X": { - "tag": "forge:storage_blocks/obsidian" - } + "X": "#forge:storage_blocks/obsidian" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/obsidian_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/obsidian_wall_recycling.json index 766f14db6..e0bf0f947 100644 --- a/src/generated/resources/data/basemetals/recipe/obsidian_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/obsidian_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:obsidian_wall" - }, + "ingredient": "basemetals:obsidian_wall", "result": { "id": "minecraft:obsidian" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_arrow.json b/src/generated/resources/data/basemetals/recipe/pewter_arrow.json index c440f4212..f8c1efb95 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:pewter_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/pewter" - }, - "R": { - "tag": "forge:rods/pewter" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/pewter", + "R": "#forge:rods/pewter" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_arrow_recycling.json index fb43315ba..6ed7af0e4 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:pewter_arrow" - }, + "ingredient": "basemetals:pewter_arrow", "result": { "id": "basemetals:pewter_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_axe.json b/src/generated/resources/data/basemetals/recipe/pewter_axe.json index a506017cb..c42c2cc30 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_axe.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/pewter" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_axe_recycling.json index db2c7128a..3a7416b53 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_axe" - }, + "ingredient": "basemetals:pewter_axe", "result": { "count": 3, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bars.json b/src/generated/resources/data/basemetals/recipe/pewter_bars.json index 66fab6b47..6e623f8ad 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bars.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_bars", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bars_2.json b/src/generated/resources/data/basemetals/recipe/pewter_bars_2.json index 535fef966..0d3384182 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_bars", "key": { - "X": { - "tag": "forge:rods/pewter" - } + "X": "#forge:rods/pewter" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_bars_recycling.json index dcc8eae40..c0bd69793 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:pewter_bars" - }, + "ingredient": "basemetals:pewter_bars", "result": { "count": 3, "id": "basemetals:pewter_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_blend.json b/src/generated/resources/data/basemetals/recipe/pewter_blend.json index 79dfdcd90..f45facd78 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_blend.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_blend.json @@ -5,15 +5,9 @@ "category": "misc", "group": "basemetals:pewter_blend", "ingredients": [ - { - "tag": "forge:dusts/tin" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/lead" - } + "#forge:dusts/tin", + "#forge:dusts/copper", + "#forge:dusts/lead" ], "result": { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipe/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/pewter_blend_from_small.json index a367f7633..7533e5988 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_blend", "key": { - "X": { - "tag": "forge:small_blends/pewter" - } + "X": "#forge:small_blends/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_blend_smelting.json index dcb85fb9e..9ab9dbea0 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:blends/pewter" - }, + "ingredient": "#forge:blends/pewter", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_block.json b/src/generated/resources/data/basemetals/recipe/pewter_block.json index a0c9d8f55..818b8a791 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_block.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_block", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json index 5407d4eaf..f3c153ff1 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/pewter" - }, + "ingredient": "#forge:storage_blocks/pewter", "result": { "count": 9, "id": "basemetals:pewter_powder" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_block_ingot.json b/src/generated/resources/data/basemetals/recipe/pewter_block_ingot.json index e09c81bbf..7ac76f07e 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/pewter" - } + "#forge:storage_blocks/pewter" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bolt.json b/src/generated/resources/data/basemetals/recipe/pewter_bolt.json index 41917ca1c..575167d7e 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/pewter" - } + "F": "minecraft:feather", + "R": "#forge:rods/pewter" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_bolt_recycling.json index 82ad448fd..365d54481 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:pewter_bolt" - }, + "ingredient": "basemetals:pewter_bolt", "result": { "count": 2, "id": "basemetals:pewter_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_boots.json b/src/generated/resources/data/basemetals/recipe/pewter_boots.json index 98adfacdb..069906688 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_boots.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:pewter_boots", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_boots_plate_repair.json index 9d02d63ee..5013f0782 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/pewter" - }, + "plate": "#forge:plates/pewter", "target": "basemetals:pewter_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_boots_recycling.json index c19eea3d8..2ac42bdc6 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_boots" - }, + "ingredient": "basemetals:pewter_boots", "result": { "count": 4, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bow.json b/src/generated/resources/data/basemetals/recipe/pewter_bow.json index 2235e5c66..874690b2c 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bow.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_bow", "key": { - "R": { - "tag": "forge:rods/pewter" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/pewter", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_bow_recycling.json index 3ddb65f4a..f197ed348 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_bow" - }, + "ingredient": "basemetals:pewter_bow", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_button.json b/src/generated/resources/data/basemetals/recipe/pewter_button.json index 26fc71fc8..796f79fd8 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_button.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_button", "key": { - "X": { - "tag": "forge:nuggets/pewter" - } + "X": "#forge:nuggets/pewter" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_button_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_button_recycling.json index ca5add563..80b9d2113 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:pewter_button" - }, + "ingredient": "basemetals:pewter_button", "result": { "count": 2, "id": "basemetals:pewter_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_chestplate.json b/src/generated/resources/data/basemetals/recipe/pewter_chestplate.json index 0268edec1..527577b8b 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:pewter_chestplate", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_chestplate_plate_repair.json index b7a991df7..517891768 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/pewter" - }, + "plate": "#forge:plates/pewter", "target": "basemetals:pewter_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_chestplate_recycling.json index 01e3b8690..bcfdfafde 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_chestplate" - }, + "ingredient": "basemetals:pewter_chestplate", "result": { "count": 8, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_crackhammer.json b/src/generated/resources/data/basemetals/recipe/pewter_crackhammer.json index a7929041a..ccd0d6bc0 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/pewter" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_crackhammer_recycling.json index 49fb2d7d8..6369df903 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:pewter_crackhammer" - }, + "ingredient": "basemetals:pewter_crackhammer", "result": { "id": "basemetals:pewter_block" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_crossbow.json b/src/generated/resources/data/basemetals/recipe/pewter_crossbow.json index b6db3d322..517d48462 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:pewter_crossbow", "key": { - "G": { - "tag": "forge:gears/pewter" - }, - "R": { - "tag": "forge:rods/pewter" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/pewter", + "R": "#forge:rods/pewter", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_crossbow_recycling.json index 3bba8bc17..1ee4b1878 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_crossbow" - }, + "ingredient": "basemetals:pewter_crossbow", "result": { "count": 4, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_door.json b/src/generated/resources/data/basemetals/recipe/pewter_door.json index b3ac13b06..95214911b 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_door.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_door", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_door_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_door_recycling.json index 6954f0529..e87919bb2 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_door" - }, + "ingredient": "basemetals:pewter_door", "result": { "count": 2, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_fishingrod.json b/src/generated/resources/data/basemetals/recipe/pewter_fishingrod.json index 9bb679e3a..816e9dbd7 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_fishing_rod", "key": { - "R": { - "tag": "forge:rods/pewter" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/pewter", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_gear.json b/src/generated/resources/data/basemetals/recipe/pewter_gear.json index d56aa112e..ac3d95a26 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_gear.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:pewter_gear", "key": { - "R": { - "tag": "forge:rods/pewter" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "R": "#forge:rods/pewter", + "X": "#forge:ingots/pewter" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_gear_recycling.json index 938443386..f29b42f56 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_gear" - }, + "ingredient": "basemetals:pewter_gear", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_helmet.json b/src/generated/resources/data/basemetals/recipe/pewter_helmet.json index 41f9494e7..a61fbcaf8 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:pewter_helmet", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_helmet_plate_repair.json index 61f51ae1d..51a9050c8 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/pewter" - }, + "plate": "#forge:plates/pewter", "target": "basemetals:pewter_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_helmet_recycling.json index ddec8946a..d2aebe144 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_helmet" - }, + "ingredient": "basemetals:pewter_helmet", "result": { "count": 5, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_hoe.json b/src/generated/resources/data/basemetals/recipe/pewter_hoe.json index dae027f3b..34016b0c4 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/pewter" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_hoe_recycling.json index 89b5b9b31..ad28ae361 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_hoe" - }, + "ingredient": "basemetals:pewter_hoe", "result": { "count": 2, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_horsearmor.json b/src/generated/resources/data/basemetals/recipe/pewter_horsearmor.json index efb104b29..2f573cd22 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/pewter" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json index ae9c79eb4..60e3f02b5 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/pewter" - }, + "ingredient": "#forge:ingots/pewter", "result": { "id": "basemetals:pewter_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/pewter_ingot_from_nuggets.json index 24b0699b7..75fd93aa2 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_ingot", "key": { - "X": { - "tag": "forge:nuggets/pewter" - } + "X": "#forge:nuggets/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_leggings.json b/src/generated/resources/data/basemetals/recipe/pewter_leggings.json index 9d33ac00b..547bda042 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:pewter_leggings", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_leggings_plate_repair.json index 46609e95e..cd057da50 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/pewter" - }, + "plate": "#forge:plates/pewter", "target": "basemetals:pewter_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_leggings_recycling.json index c1080c78e..bd3f715fa 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_leggings" - }, + "ingredient": "basemetals:pewter_leggings", "result": { "count": 7, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_lever.json b/src/generated/resources/data/basemetals/recipe/pewter_lever.json index 67c01f6b9..a1f49c2c9 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_lever.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:pewter_lever", "key": { - "R": { - "tag": "forge:rods/pewter" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "R": "#forge:rods/pewter", + "X": "#forge:ingots/pewter" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_lever_recycling.json index 69d60a314..e49ba0669 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_lever" - }, + "ingredient": "basemetals:pewter_lever", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json index 668739b40..dab8c68bc 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/pewter" - }, + "ingredient": "#forge:nuggets/pewter", "result": { "id": "basemetals:pewter_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_nuggets.json b/src/generated/resources/data/basemetals/recipe/pewter_nuggets.json index 7acdbf2d1..b60e5b8a3 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_nugget", "ingredients": [ - { - "tag": "forge:ingots/pewter" - } + "#forge:ingots/pewter" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/pewter_pickaxe.json b/src/generated/resources/data/basemetals/recipe/pewter_pickaxe.json index a6ae8e1d2..a231a05ca 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_pickaxe_recycling.json index 5157cc893..2d10c11dc 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_pickaxe" - }, + "ingredient": "basemetals:pewter_pickaxe", "result": { "count": 3, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_plate.json b/src/generated/resources/data/basemetals/recipe/pewter_plate.json index 3a8e52931..6b61e7c62 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_plate.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_plate", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_plate_recycling.json index f67638029..bba358810 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_plate" - }, + "ingredient": "basemetals:pewter_plate", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/pewter_powder_from_small.json index a7c08f3de..460212557 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/pewter" - } + "X": "#forge:tiny_dusts/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_powder_smelting.json index 75c801511..0bb1e11c8 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/pewter" - }, + "ingredient": "#forge:dusts/pewter", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate.json index ac73eb8cc..8c6bf87fa 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate_recycling.json index 9024e7023..3fdcdb837 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_pressure_plate" - }, + "ingredient": "basemetals:pewter_pressure_plate", "result": { "count": 2, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_rod.json b/src/generated/resources/data/basemetals/recipe/pewter_rod.json index da1f49074..c35d78b8e 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_rod.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_rod", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_rod_recycling.json index a81fc944a..617e169a5 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:pewter_rod" - }, + "ingredient": "basemetals:pewter_rod", "result": { "count": 4, "id": "basemetals:pewter_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_scythe.json b/src/generated/resources/data/basemetals/recipe/pewter_scythe.json index 7d33c1ea5..474141ecd 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/pewter" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_shears.json b/src/generated/resources/data/basemetals/recipe/pewter_shears.json index 8472d4b49..edf181b26 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_shears.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:pewter_shears", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_shears_recycling.json index 1af8a0efd..badbac27c 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_shears" - }, + "ingredient": "basemetals:pewter_shears", "result": { "count": 2, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_shield.json b/src/generated/resources/data/basemetals/recipe/pewter_shield.json index a27441ef8..f98d965d7 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_shield.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/pewter" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/pewter_shield_plate_repair.json index e03a2edca..b847409c1 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/pewter" - }, + "plate": "#forge:plates/pewter", "target": "basemetals:pewter_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/pewter_shovel.json b/src/generated/resources/data/basemetals/recipe/pewter_shovel.json index e74ed7e1c..b383f5fd0 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/pewter" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_shovel_recycling.json index 927b19168..d4aae47d0 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_shovel" - }, + "ingredient": "basemetals:pewter_shovel", "result": { "id": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_slab.json b/src/generated/resources/data/basemetals/recipe/pewter_slab.json index 636236c84..404997bb4 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_slab.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_slab", "key": { - "X": { - "tag": "forge:storage_blocks/pewter" - } + "X": "#forge:storage_blocks/pewter" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_slab_recycling.json index 4a33ee930..fe27a269a 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:pewter_slab" - }, + "ingredient": "basemetals:pewter_slab", "result": { "count": 4, "id": "basemetals:pewter_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_smallblend.json b/src/generated/resources/data/basemetals/recipe/pewter_smallblend.json index ec09069a5..122cff711 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_smallblend", "ingredients": [ - { - "tag": "forge:blends/pewter" - } + "#forge:blends/pewter" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/pewter_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_smallblend_smelting.json index 26d26914a..dbee17078 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:small_blends/pewter" - }, + "ingredient": "#forge:small_blends/pewter", "result": { "id": "basemetals:pewter_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_smallpowder.json b/src/generated/resources/data/basemetals/recipe/pewter_smallpowder.json index 30f5b7858..ba8560728 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:pewter_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/pewter" - } + "#forge:dusts/pewter" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/pewter_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/pewter_smallpowder_smelting.json index b2ce01a70..532f88bc4 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/pewter" - }, + "ingredient": "#forge:tiny_dusts/pewter", "result": { "id": "basemetals:pewter_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/pewter_stairs.json b/src/generated/resources/data/basemetals/recipe/pewter_stairs.json index aee2d0942..e26bc2631 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/pewter" - } + "X": "#forge:storage_blocks/pewter" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_sword.json b/src/generated/resources/data/basemetals/recipe/pewter_sword.json index 3c40d453b..e9625bdbf 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_sword.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:pewter_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/pewter" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/pewter" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_sword_recycling.json index 8352ef6ee..d672cdb70 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_sword" - }, + "ingredient": "basemetals:pewter_sword", "result": { "count": 2, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_trapdoor.json b/src/generated/resources/data/basemetals/recipe/pewter_trapdoor.json index bafc80874..8e7f0afd1 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_trapdoor", "key": { - "X": { - "tag": "forge:ingots/pewter" - } + "X": "#forge:ingots/pewter" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_trapdoor_recycling.json index 9cb06ca17..b7db8fd94 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:pewter_trapdoor" - }, + "ingredient": "basemetals:pewter_trapdoor", "result": { "count": 4, "id": "basemetals:pewter_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/pewter_wall.json b/src/generated/resources/data/basemetals/recipe/pewter_wall.json index 273d62064..93a84f355 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_wall.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:pewter_wall", "key": { - "X": { - "tag": "forge:storage_blocks/pewter" - } + "X": "#forge:storage_blocks/pewter" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/pewter_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/pewter_wall_recycling.json index 8f54a32bb..2af02d5b0 100644 --- a/src/generated/resources/data/basemetals/recipe/pewter_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/pewter_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:pewter_wall" - }, + "ingredient": "basemetals:pewter_wall", "result": { "id": "basemetals:pewter_block" } diff --git a/src/generated/resources/data/basemetals/recipe/piston.json b/src/generated/resources/data/basemetals/recipe/piston.json index 81ad97e8c..7f60f9047 100644 --- a/src/generated/resources/data/basemetals/recipe/piston.json +++ b/src/generated/resources/data/basemetals/recipe/piston.json @@ -5,18 +5,10 @@ "category": "building", "group": "minecraft:piston", "key": { - "C": { - "tag": "forge:cobblestone" - }, - "R": { - "tag": "forge:dusts/redstone" - }, - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/steel" - } + "C": "#forge:cobblestone", + "R": "#forge:dusts/redstone", + "W": "#minecraft:planks", + "X": "#forge:ingots/steel" }, "pattern": [ "WWW", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_arrow.json b/src/generated/resources/data/basemetals/recipe/platinum_arrow.json index c947d42d2..8d994c765 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:platinum_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/platinum" - }, - "R": { - "tag": "forge:rods/platinum" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/platinum", + "R": "#forge:rods/platinum" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_arrow_recycling.json index c9ffb8a1a..3bfc78af7 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:platinum_arrow" - }, + "ingredient": "basemetals:platinum_arrow", "result": { "id": "basemetals:platinum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_axe.json b/src/generated/resources/data/basemetals/recipe/platinum_axe.json index 54bd2cf75..3976a079f 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_axe.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/platinum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_axe_recycling.json index 9d1980a32..db157509d 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_axe" - }, + "ingredient": "basemetals:platinum_axe", "result": { "count": 3, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bars.json b/src/generated/resources/data/basemetals/recipe/platinum_bars.json index aa6538f2f..6b1b69264 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bars.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_bars", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bars_2.json b/src/generated/resources/data/basemetals/recipe/platinum_bars_2.json index d00a1a88e..b663ca557 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_bars", "key": { - "X": { - "tag": "forge:rods/platinum" - } + "X": "#forge:rods/platinum" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_bars_recycling.json index aa621d1e3..428ebca4f 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:platinum_bars" - }, + "ingredient": "basemetals:platinum_bars", "result": { "count": 3, "id": "basemetals:platinum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_block.json b/src/generated/resources/data/basemetals/recipe/platinum_block.json index a15da1469..c1ef70a89 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_block.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_block", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json index cffa42431..07649fd38 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/platinum" - }, + "ingredient": "#forge:storage_blocks/platinum", "result": { "count": 9, "id": "basemetals:platinum_powder" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_block_ingot.json b/src/generated/resources/data/basemetals/recipe/platinum_block_ingot.json index dcff02e36..07ec90366 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:platinum_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/platinum" - } + "#forge:storage_blocks/platinum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bolt.json b/src/generated/resources/data/basemetals/recipe/platinum_bolt.json index e29946f4e..1def72777 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/platinum" - } + "F": "minecraft:feather", + "R": "#forge:rods/platinum" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_bolt_recycling.json index 6d58dfd49..3604a4b37 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:platinum_bolt" - }, + "ingredient": "basemetals:platinum_bolt", "result": { "count": 2, "id": "basemetals:platinum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_boots.json b/src/generated/resources/data/basemetals/recipe/platinum_boots.json index 10b40e377..fbca62f2b 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_boots.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:platinum_boots", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_boots_plate_repair.json index 9ecba34da..91b9cb8fa 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/platinum" - }, + "plate": "#forge:plates/platinum", "target": "basemetals:platinum_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_boots_recycling.json index 7dfcf3cbd..98fdcbf89 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_boots" - }, + "ingredient": "basemetals:platinum_boots", "result": { "count": 4, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bow.json b/src/generated/resources/data/basemetals/recipe/platinum_bow.json index dd749f650..46b417dca 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bow.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_bow", "key": { - "R": { - "tag": "forge:rods/platinum" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/platinum", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_bow_recycling.json index 5f2695ac1..11dbfcb93 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_bow" - }, + "ingredient": "basemetals:platinum_bow", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_button.json b/src/generated/resources/data/basemetals/recipe/platinum_button.json index 903528a1a..12dc158f8 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_button.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_button", "key": { - "X": { - "tag": "forge:nuggets/platinum" - } + "X": "#forge:nuggets/platinum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_button_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_button_recycling.json index 9cf382530..af0b99bb0 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:platinum_button" - }, + "ingredient": "basemetals:platinum_button", "result": { "count": 2, "id": "basemetals:platinum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_chestplate.json b/src/generated/resources/data/basemetals/recipe/platinum_chestplate.json index 414e790e9..cfe7e5a58 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:platinum_chestplate", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_chestplate_plate_repair.json index d70a512b4..3914de572 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/platinum" - }, + "plate": "#forge:plates/platinum", "target": "basemetals:platinum_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_chestplate_recycling.json index 1786a4390..95ac8e7ea 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_chestplate" - }, + "ingredient": "basemetals:platinum_chestplate", "result": { "count": 8, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_crackhammer.json b/src/generated/resources/data/basemetals/recipe/platinum_crackhammer.json index 1d1a2e362..ca5e7198d 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/platinum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_crackhammer_recycling.json index 5db393ea3..76972774c 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:platinum_crackhammer" - }, + "ingredient": "basemetals:platinum_crackhammer", "result": { "id": "basemetals:platinum_block" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_crossbow.json b/src/generated/resources/data/basemetals/recipe/platinum_crossbow.json index d32d9358e..a23da75fd 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:platinum_crossbow", "key": { - "G": { - "tag": "forge:gears/platinum" - }, - "R": { - "tag": "forge:rods/platinum" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/platinum", + "R": "#forge:rods/platinum", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_crossbow_recycling.json index 1b1e8e77e..012bb20e6 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_crossbow" - }, + "ingredient": "basemetals:platinum_crossbow", "result": { "count": 4, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_door.json b/src/generated/resources/data/basemetals/recipe/platinum_door.json index f8170bb0c..c4543aecf 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_door.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_door", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_door_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_door_recycling.json index 1cb40f9cd..1260b4052 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_door" - }, + "ingredient": "basemetals:platinum_door", "result": { "count": 2, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_fishingrod.json b/src/generated/resources/data/basemetals/recipe/platinum_fishingrod.json index 303c860f3..3304326c9 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_fishing_rod", "key": { - "R": { - "tag": "forge:rods/platinum" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/platinum", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_gear.json b/src/generated/resources/data/basemetals/recipe/platinum_gear.json index 8a72c05b4..87b647938 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_gear.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:platinum_gear", "key": { - "R": { - "tag": "forge:rods/platinum" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "R": "#forge:rods/platinum", + "X": "#forge:ingots/platinum" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_gear_recycling.json index a48580b77..6b01bc4c2 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_gear" - }, + "ingredient": "basemetals:platinum_gear", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_helmet.json b/src/generated/resources/data/basemetals/recipe/platinum_helmet.json index 370926157..81d0e8bcb 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:platinum_helmet", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_helmet_plate_repair.json index 42d87a1fe..6efd3d893 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/platinum" - }, + "plate": "#forge:plates/platinum", "target": "basemetals:platinum_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_helmet_recycling.json index be9c6cba6..10979b8f9 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_helmet" - }, + "ingredient": "basemetals:platinum_helmet", "result": { "count": 5, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_hoe.json b/src/generated/resources/data/basemetals/recipe/platinum_hoe.json index 6f401ed4f..fd6b777e7 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/platinum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_hoe_recycling.json index 6274d99af..dff8b747f 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_hoe" - }, + "ingredient": "basemetals:platinum_hoe", "result": { "count": 2, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_horsearmor.json b/src/generated/resources/data/basemetals/recipe/platinum_horsearmor.json index a2440fcd9..501b3ba91 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/platinum" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json index 1a114b0ce..746c0ccc2 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/platinum" - }, + "ingredient": "#forge:ingots/platinum", "result": { "id": "basemetals:platinum_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/platinum_ingot_from_nuggets.json index e02a1de51..dd84fc785 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:platinum_ingot", "key": { - "X": { - "tag": "forge:nuggets/platinum" - } + "X": "#forge:nuggets/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_leggings.json b/src/generated/resources/data/basemetals/recipe/platinum_leggings.json index 5d363de81..0a57a4bb4 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:platinum_leggings", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_leggings_plate_repair.json index 7af851038..4e01fabf7 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/platinum" - }, + "plate": "#forge:plates/platinum", "target": "basemetals:platinum_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_leggings_recycling.json index 8bbeb4ec9..f83f14da3 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_leggings" - }, + "ingredient": "basemetals:platinum_leggings", "result": { "count": 7, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_lever.json b/src/generated/resources/data/basemetals/recipe/platinum_lever.json index a9a202116..23bf75661 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_lever.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:platinum_lever", "key": { - "R": { - "tag": "forge:rods/platinum" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "R": "#forge:rods/platinum", + "X": "#forge:ingots/platinum" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_lever_recycling.json index cb16aaca3..9791512ad 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_lever" - }, + "ingredient": "basemetals:platinum_lever", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json index 3b55b9f35..e38ae931a 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/platinum" - }, + "ingredient": "#forge:nuggets/platinum", "result": { "id": "basemetals:platinum_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_nuggets.json b/src/generated/resources/data/basemetals/recipe/platinum_nuggets.json index c0a83b036..2a81d6f6d 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:platinum_nugget", "ingredients": [ - { - "tag": "forge:ingots/platinum" - } + "#forge:ingots/platinum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_blasting.json index 2f94c3263..15e2aeb75 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 1.5, - "ingredient": { - "tag": "forge:ores/platinum" - }, + "ingredient": "#forge:ores/platinum", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json index bfee6a32b..e3a83660b 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/platinum" - }, + "ingredient": "#forge:ores/platinum", "result": { "count": 2, "id": "basemetals:platinum_powder" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_ore_smelting.json index 7c3f03372..012824bda 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "tag": "forge:ores/platinum" - }, + "ingredient": "#forge:ores/platinum", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_pickaxe.json b/src/generated/resources/data/basemetals/recipe/platinum_pickaxe.json index 9dcddb382..c9a79fa28 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_pickaxe_recycling.json index 69374bae9..d41253256 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_pickaxe" - }, + "ingredient": "basemetals:platinum_pickaxe", "result": { "count": 3, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_plate.json b/src/generated/resources/data/basemetals/recipe/platinum_plate.json index 58bb0da39..5e04a0303 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_plate.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_plate", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_plate_recycling.json index 294e56f97..8fbc9ff72 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_plate" - }, + "ingredient": "basemetals:platinum_plate", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/platinum_powder_from_small.json index c5608d528..be944fe5b 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:platinum_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/platinum" - } + "X": "#forge:tiny_dusts/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_powder_smelting.json index 203f408a3..297fdf8aa 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "tag": "forge:dusts/platinum" - }, + "ingredient": "#forge:dusts/platinum", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate.json index 771afc1a1..2d0524aba 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate_recycling.json index 81f30b328..29b4e3bfc 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_pressure_plate" - }, + "ingredient": "basemetals:platinum_pressure_plate", "result": { "count": 2, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_blasting.json index c4d42f77d..e66471fc2 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 1.5, - "ingredient": { - "tag": "forge:raw_materials/platinum" - }, + "ingredient": "#forge:raw_materials/platinum", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json index e2f974490..a058117ae 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/platinum" - }, + "ingredient": "#forge:raw_materials/platinum", "result": { "id": "basemetals:platinum_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_raw_smelting.json index 446181c1d..4d203834e 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "tag": "forge:raw_materials/platinum" - }, + "ingredient": "#forge:raw_materials/platinum", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_rod.json b/src/generated/resources/data/basemetals/recipe/platinum_rod.json index b01c1b3f8..7de894921 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_rod.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:platinum_rod", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_rod_recycling.json index 858c0b198..a6b5bb016 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:platinum_rod" - }, + "ingredient": "basemetals:platinum_rod", "result": { "count": 4, "id": "basemetals:platinum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_scythe.json b/src/generated/resources/data/basemetals/recipe/platinum_scythe.json index db0bd67f2..e9a80e04c 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/platinum" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_shears.json b/src/generated/resources/data/basemetals/recipe/platinum_shears.json index 962f53e4f..1d09d5545 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_shears.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:platinum_shears", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_shears_recycling.json index db586a7f5..936e422f8 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_shears" - }, + "ingredient": "basemetals:platinum_shears", "result": { "count": 2, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_shield.json b/src/generated/resources/data/basemetals/recipe/platinum_shield.json index 9f3992448..13cc6ba0e 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_shield.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/platinum" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/platinum_shield_plate_repair.json index 9b0fb10dd..9a0e5c552 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/platinum" - }, + "plate": "#forge:plates/platinum", "target": "basemetals:platinum_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/platinum_shovel.json b/src/generated/resources/data/basemetals/recipe/platinum_shovel.json index 3ec2d74b5..433aa857c 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/platinum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_shovel_recycling.json index dd713b696..d074d8fce 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_shovel" - }, + "ingredient": "basemetals:platinum_shovel", "result": { "id": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_slab.json b/src/generated/resources/data/basemetals/recipe/platinum_slab.json index bbf76fe4f..ccadb8bbe 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_slab.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_slab", "key": { - "X": { - "tag": "forge:storage_blocks/platinum" - } + "X": "#forge:storage_blocks/platinum" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_slab_recycling.json index 6d940ea0b..68bab7568 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "item": "basemetals:platinum_slab" - }, + "ingredient": "basemetals:platinum_slab", "result": { "count": 4, "id": "basemetals:platinum_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_smallpowder.json b/src/generated/resources/data/basemetals/recipe/platinum_smallpowder.json index 8730d911c..c2bb34d64 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:platinum_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/platinum" - } + "#forge:dusts/platinum" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/platinum_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/platinum_smallpowder_smelting.json index c441c8da6..2021f1272 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.17, - "ingredient": { - "tag": "forge:tiny_dusts/platinum" - }, + "ingredient": "#forge:tiny_dusts/platinum", "result": { "id": "basemetals:platinum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/platinum_stairs.json b/src/generated/resources/data/basemetals/recipe/platinum_stairs.json index 13c32102f..3492938e2 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/platinum" - } + "X": "#forge:storage_blocks/platinum" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_sword.json b/src/generated/resources/data/basemetals/recipe/platinum_sword.json index 5e02a4135..460167fa6 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_sword.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:platinum_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/platinum" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/platinum" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_sword_recycling.json index cb9d33e92..86848ad36 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_sword" - }, + "ingredient": "basemetals:platinum_sword", "result": { "count": 2, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_trapdoor.json b/src/generated/resources/data/basemetals/recipe/platinum_trapdoor.json index 968d0372d..29bfe3d4a 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_trapdoor", "key": { - "X": { - "tag": "forge:ingots/platinum" - } + "X": "#forge:ingots/platinum" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_trapdoor_recycling.json index 9be543975..3cc513f41 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.5, - "ingredient": { - "item": "basemetals:platinum_trapdoor" - }, + "ingredient": "basemetals:platinum_trapdoor", "result": { "count": 4, "id": "basemetals:platinum_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/platinum_wall.json b/src/generated/resources/data/basemetals/recipe/platinum_wall.json index a1cf98b84..44e00204f 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_wall.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:platinum_wall", "key": { - "X": { - "tag": "forge:storage_blocks/platinum" - } + "X": "#forge:storage_blocks/platinum" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/platinum_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/platinum_wall_recycling.json index 08870d12b..5ef983ab8 100644 --- a/src/generated/resources/data/basemetals/recipe/platinum_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/platinum_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:platinum_wall" - }, + "ingredient": "basemetals:platinum_wall", "result": { "id": "basemetals:platinum_block" } diff --git a/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json b/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json index 9071cd083..7a42d236b 100644 --- a/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/prismarine_bricks_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:prismarine_bricks" - }, + "ingredient": "minecraft:prismarine_bricks", "result": { "count": 9, "id": "minecraft:prismarine_shard" diff --git a/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json b/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json index a60fcdf98..6af863ed7 100644 --- a/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/prismarine_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:prismarine" - }, + "ingredient": "minecraft:prismarine", "result": { "count": 4, "id": "minecraft:prismarine_shard" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_arrow.json b/src/generated/resources/data/basemetals/recipe/quartz_arrow.json index 720d0ad84..353e02ee7 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:quartz_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/quartz" - }, - "R": { - "tag": "forge:rods/quartz" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/quartz", + "R": "#forge:rods/quartz" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_arrow_recycling.json index 98f173117..ccd16e8b3 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:quartz_arrow" - }, + "ingredient": "basemetals:quartz_arrow", "result": { "id": "basemetals:quartz_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_axe.json b/src/generated/resources/data/basemetals/recipe/quartz_axe.json index 5932b5e93..4baf2e608 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_axe.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/quartz" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_axe_recycling.json index 1d29c9873..f7ffd2568 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_axe" - }, + "ingredient": "basemetals:quartz_axe", "result": { "count": 3, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bars.json b/src/generated/resources/data/basemetals/recipe/quartz_bars.json index 65b25e970..1c8ebba2a 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bars.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_bars", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bars_2.json b/src/generated/resources/data/basemetals/recipe/quartz_bars_2.json index ebe0d0881..1285eb32f 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_bars", "key": { - "X": { - "tag": "forge:rods/quartz" - } + "X": "#forge:rods/quartz" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_bars_recycling.json index 05d9673fb..58ec38306 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:quartz_bars" - }, + "ingredient": "basemetals:quartz_bars", "result": { "count": 3, "id": "basemetals:quartz_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json index ede0137b9..41725de42 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:quartz_block" - }, + "ingredient": "minecraft:quartz_block", "result": { "count": 4, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bolt.json b/src/generated/resources/data/basemetals/recipe/quartz_bolt.json index 4b162ecb1..4456426f3 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/quartz" - } + "F": "minecraft:feather", + "R": "#forge:rods/quartz" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_bolt_recycling.json index af13b6f8d..77e13b151 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:quartz_bolt" - }, + "ingredient": "basemetals:quartz_bolt", "result": { "count": 2, "id": "basemetals:quartz_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_boots.json b/src/generated/resources/data/basemetals/recipe/quartz_boots.json index 2a3a4fa5f..c1eda0d85 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_boots.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:quartz_boots", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_boots_recycling.json index 39bb6175c..5b7dd660a 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_boots" - }, + "ingredient": "basemetals:quartz_boots", "result": { "count": 4, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bow.json b/src/generated/resources/data/basemetals/recipe/quartz_bow.json index 13de24e41..bbeeb7916 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bow.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_bow", "key": { - "R": { - "tag": "forge:rods/quartz" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/quartz", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_bow_recycling.json index 5a3e168d0..6b394553e 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_bow" - }, + "ingredient": "basemetals:quartz_bow", "result": { "id": "minecraft:quartz" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_button.json b/src/generated/resources/data/basemetals/recipe/quartz_button.json index 59dbf273e..c1c5fd548 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_button.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_button", "key": { - "X": { - "tag": "forge:nuggets/quartz" - } + "X": "#forge:nuggets/quartz" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_button_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_button_recycling.json index 34f79efa2..535bc428c 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:quartz_button" - }, + "ingredient": "basemetals:quartz_button", "result": { "count": 2, "id": "basemetals:quartz_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_chestplate.json b/src/generated/resources/data/basemetals/recipe/quartz_chestplate.json index bf9dacdcf..396ad89c5 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:quartz_chestplate", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_chestplate_recycling.json index c987abea1..dc2cba075 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_chestplate" - }, + "ingredient": "basemetals:quartz_chestplate", "result": { "count": 8, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_crackhammer.json b/src/generated/resources/data/basemetals/recipe/quartz_crackhammer.json index cb4997654..6a3ff49f5 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/quartz" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_crackhammer_recycling.json index 9657724c7..619bd5c0b 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:quartz_crackhammer" - }, + "ingredient": "basemetals:quartz_crackhammer", "result": { "id": "minecraft:quartz_block" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_crossbow.json b/src/generated/resources/data/basemetals/recipe/quartz_crossbow.json index f2b68a65d..3db74220d 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:quartz_crossbow", "key": { - "G": { - "tag": "forge:gears/quartz" - }, - "R": { - "tag": "forge:rods/quartz" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/quartz", + "R": "#forge:rods/quartz", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_crossbow_recycling.json index f2ef4203a..be375a346 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_crossbow" - }, + "ingredient": "basemetals:quartz_crossbow", "result": { "count": 4, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_crushing.json index 72de8713f..d33f05503 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:quartz" - }, + "ingredient": "minecraft:quartz", "result": { "id": "basemetals:quartz_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_door.json b/src/generated/resources/data/basemetals/recipe/quartz_door.json index 31dac9013..d07485ede 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_door.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_door", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_door_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_door_recycling.json index 3c76c5c4b..d94e299be 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_door" - }, + "ingredient": "basemetals:quartz_door", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_fishingrod.json b/src/generated/resources/data/basemetals/recipe/quartz_fishingrod.json index ae76a4ac3..a10e5f1c4 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_fishing_rod", "key": { - "R": { - "tag": "forge:rods/quartz" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/quartz", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_gear.json b/src/generated/resources/data/basemetals/recipe/quartz_gear.json index 566405bd0..832dd8f7d 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_gear.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:quartz_gear", "key": { - "R": { - "tag": "forge:rods/quartz" - }, - "X": { - "tag": "forge:gems/quartz" - } + "R": "#forge:rods/quartz", + "X": "#forge:gems/quartz" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_gear_recycling.json index a60b7e457..f179b1ea8 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_gear" - }, + "ingredient": "basemetals:quartz_gear", "result": { "id": "minecraft:quartz" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_helmet.json b/src/generated/resources/data/basemetals/recipe/quartz_helmet.json index d110913ba..a84332cd9 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:quartz_helmet", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_helmet_recycling.json index 8302488af..f1018da7f 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_helmet" - }, + "ingredient": "basemetals:quartz_helmet", "result": { "count": 5, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_hoe.json b/src/generated/resources/data/basemetals/recipe/quartz_hoe.json index 2b122dcbf..9e98ef717 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/quartz" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_hoe_recycling.json index 47b520796..1e101bacb 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_hoe" - }, + "ingredient": "basemetals:quartz_hoe", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_horsearmor.json b/src/generated/resources/data/basemetals/recipe/quartz_horsearmor.json index e46f5c588..050c76592 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:gems/quartz" - } + "W": "#minecraft:wool", + "X": "#forge:gems/quartz" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_ingot.json b/src/generated/resources/data/basemetals/recipe/quartz_ingot.json index 91ac6a0ed..200f8d7ba 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "minecraft:quartz", "key": { - "X": { - "tag": "forge:nuggets/quartz" - } + "X": "#forge:nuggets/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_leggings.json b/src/generated/resources/data/basemetals/recipe/quartz_leggings.json index 2046cf276..fb37d7453 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:quartz_leggings", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_leggings_recycling.json index 942ea355c..0c3c93e6c 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_leggings" - }, + "ingredient": "basemetals:quartz_leggings", "result": { "count": 7, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_lever.json b/src/generated/resources/data/basemetals/recipe/quartz_lever.json index 15cea3ae2..906ab18e1 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_lever.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:quartz_lever", "key": { - "R": { - "tag": "forge:rods/quartz" - }, - "X": { - "tag": "forge:gems/quartz" - } + "R": "#forge:rods/quartz", + "X": "#forge:gems/quartz" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_lever_recycling.json index 59e58c7cc..14cc5ae05 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_lever" - }, + "ingredient": "basemetals:quartz_lever", "result": { "id": "minecraft:quartz" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_nugget.json b/src/generated/resources/data/basemetals/recipe/quartz_nugget.json index c451f8649..2118b9427 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_nugget.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_nugget.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:quartz_nugget", "ingredients": [ - { - "tag": "forge:gems/quartz" - } + "#forge:gems/quartz" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json index 25493a342..2015e4828 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/quartz" - }, + "ingredient": "#forge:nuggets/quartz", "result": { "id": "basemetals:quartz_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json index d4ef7a3f4..496ca75ce 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/quartz" - }, + "ingredient": "#forge:ores/quartz", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_pickaxe.json b/src/generated/resources/data/basemetals/recipe/quartz_pickaxe.json index 3c74b97f0..768f34f3e 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_pickaxe_recycling.json index 35545d42a..325ee4191 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_pickaxe" - }, + "ingredient": "basemetals:quartz_pickaxe", "result": { "count": 3, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/quartz_powder_from_small.json index 7e30c497b..aac20ef7e 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:quartz_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/quartz" - } + "X": "#forge:tiny_dusts/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/quartz_powder_smelting.json index 0dbdbfb52..a1b0f0204 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "tag": "forge:dusts/quartz" - }, + "ingredient": "#forge:dusts/quartz", "result": { "id": "minecraft:quartz" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate.json index ec9c96fbe..b499c6f6c 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_pressure_plate", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate_recycling.json index 755657879..5f2880289 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_pressure_plate" - }, + "ingredient": "basemetals:quartz_pressure_plate", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_rod.json b/src/generated/resources/data/basemetals/recipe/quartz_rod.json index f40992bb2..c539ece1f 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_rod.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:quartz_rod", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_rod_recycling.json index feafbaff8..f916709af 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:quartz_rod" - }, + "ingredient": "basemetals:quartz_rod", "result": { "count": 4, "id": "basemetals:quartz_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_scythe.json b/src/generated/resources/data/basemetals/recipe/quartz_scythe.json index 3860e0e4d..f79e572f3 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/quartz" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_shears.json b/src/generated/resources/data/basemetals/recipe/quartz_shears.json index 4b70dae82..73ee28c47 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_shears.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:quartz_shears", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_shears_recycling.json index d1d49fffb..f994abd88 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_shears" - }, + "ingredient": "basemetals:quartz_shears", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_shield.json b/src/generated/resources/data/basemetals/recipe/quartz_shield.json index 71fe4b817..64ec2db22 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_shield.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:gems/quartz" - } + "W": "#minecraft:planks", + "X": "#forge:gems/quartz" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_shovel.json b/src/generated/resources/data/basemetals/recipe/quartz_shovel.json index 885fcf7d8..7d22a57e7 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/quartz" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_shovel_recycling.json index 67ea26095..d51716b2b 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_shovel" - }, + "ingredient": "basemetals:quartz_shovel", "result": { "id": "minecraft:quartz" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json index 3f0bd94a4..d4210ee9d 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_slab_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:quartz_slab" - }, + "ingredient": "minecraft:quartz_slab", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_smallpowder.json b/src/generated/resources/data/basemetals/recipe/quartz_smallpowder.json index b6ac171ac..ceba03098 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:quartz_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/quartz" - } + "#forge:dusts/quartz" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/quartz_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/quartz_smallpowder_smelting.json index 0bfb65eb1..760addf71 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "tag": "forge:tiny_dusts/quartz" - }, + "ingredient": "#forge:tiny_dusts/quartz", "result": { "id": "basemetals:quartz_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/quartz_sword.json b/src/generated/resources/data/basemetals/recipe/quartz_sword.json index fee4aff50..b95a3cec3 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_sword.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:quartz_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } + "S": "#forge:rods/wooden", + "X": "#forge:gems/quartz" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_sword_recycling.json index 791684761..e748bd4d4 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_sword" - }, + "ingredient": "basemetals:quartz_sword", "result": { "count": 2, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_trapdoor.json b/src/generated/resources/data/basemetals/recipe/quartz_trapdoor.json index 59e42879a..b2e1eb219 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_trapdoor", "key": { - "X": { - "tag": "forge:gems/quartz" - } + "X": "#forge:gems/quartz" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_trapdoor_recycling.json index b3f4f2a13..4f6552643 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:quartz_trapdoor" - }, + "ingredient": "basemetals:quartz_trapdoor", "result": { "count": 4, "id": "minecraft:quartz" diff --git a/src/generated/resources/data/basemetals/recipe/quartz_wall.json b/src/generated/resources/data/basemetals/recipe/quartz_wall.json index 74b5e5fb8..6812ec8a0 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_wall.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:quartz_wall", "key": { - "X": { - "tag": "forge:storage_blocks/quartz" - } + "X": "#forge:storage_blocks/quartz" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/quartz_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/quartz_wall_recycling.json index 2e63e3ed5..50cefadbd 100644 --- a/src/generated/resources/data/basemetals/recipe/quartz_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/quartz_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:quartz_wall" - }, + "ingredient": "basemetals:quartz_wall", "result": { "id": "minecraft:quartz_block" } diff --git a/src/generated/resources/data/basemetals/recipe/rail.json b/src/generated/resources/data/basemetals/recipe/rail.json index 6c09e9226..8795399b8 100644 --- a/src/generated/resources/data/basemetals/recipe/rail.json +++ b/src/generated/resources/data/basemetals/recipe/rail.json @@ -5,12 +5,8 @@ "category": "building", "group": "minecraft:rail", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json b/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json index d96c14b85..cdb4f3e4c 100644 --- a/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/red_sandstone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:red_sandstone" - }, + "ingredient": "minecraft:red_sandstone", "result": { "count": 4, "id": "minecraft:red_sand" diff --git a/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json index 364e94645..9446ce8de 100644 --- a/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/red_sandstone_slab_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:red_sandstone_slab" - }, + "ingredient": "minecraft:red_sandstone_slab", "result": { "count": 2, "id": "minecraft:red_sand" diff --git a/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json b/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json index a669dcee2..d6d07b4ed 100644 --- a/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/redstone_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/redstone" - }, + "ingredient": "#forge:storage_blocks/redstone", "result": { "count": 9, "id": "minecraft:redstone" diff --git a/src/generated/resources/data/basemetals/recipe/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/recipe/redstone_from_smallpowder.json index 2ad6f53e8..3c6677b44 100644 --- a/src/generated/resources/data/basemetals/recipe/redstone_from_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/redstone_from_smallpowder.json @@ -5,9 +5,7 @@ "category": "building", "group": "minecraft:redstone", "key": { - "X": { - "tag": "forge:tiny_dusts/redstone" - } + "X": "#forge:tiny_dusts/redstone" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json index 5ef8bf6d9..69e12e958 100644 --- a/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/redstone_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/redstone" - }, + "ingredient": "#forge:ores/redstone", "result": { "count": 8, "id": "minecraft:redstone" diff --git a/src/generated/resources/data/basemetals/recipe/redstone_smallpowder.json b/src/generated/resources/data/basemetals/recipe/redstone_smallpowder.json index 3eec62157..151e625f2 100644 --- a/src/generated/resources/data/basemetals/recipe/redstone_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/redstone_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:redstone_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/redstone" - } + "#forge:dusts/redstone" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json b/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json index 8faa491ae..2e7260d30 100644 --- a/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/sandstone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sandstone" - }, + "ingredient": "minecraft:sandstone", "result": { "count": 4, "id": "minecraft:sand" diff --git a/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json index 45a093147..6336108c3 100644 --- a/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/sandstone_slab_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sandstone_slab" - }, + "ingredient": "minecraft:sandstone_slab", "result": { "count": 2, "id": "minecraft:sand" diff --git a/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json b/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json index 5fa01cb86..0e37a07fe 100644 --- a/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/sea_lantern_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sea_lantern" - }, + "ingredient": "minecraft:sea_lantern", "result": { "count": 5, "id": "minecraft:prismarine_crystals" diff --git a/src/generated/resources/data/basemetals/recipe/silver_arrow.json b/src/generated/resources/data/basemetals/recipe/silver_arrow.json index 3c8810484..57267b954 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/silver_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:silver_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/silver" - }, - "R": { - "tag": "forge:rods/silver" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/silver", + "R": "#forge:rods/silver" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/silver_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_arrow_recycling.json index 5c763fe0a..3d92f1e49 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:silver_arrow" - }, + "ingredient": "basemetals:silver_arrow", "result": { "id": "basemetals:silver_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_axe.json b/src/generated/resources/data/basemetals/recipe/silver_axe.json index 0f21db278..c13446a97 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_axe.json +++ b/src/generated/resources/data/basemetals/recipe/silver_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/silver" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_axe_recycling.json index 3277391c4..6e997ba81 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_axe" - }, + "ingredient": "basemetals:silver_axe", "result": { "count": 3, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_bars.json b/src/generated/resources/data/basemetals/recipe/silver_bars.json index 7a3a96290..b6c7cc22e 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bars.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_bars", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_bars_2.json b/src/generated/resources/data/basemetals/recipe/silver_bars_2.json index 45fcca1cd..b6db6a3ea 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_bars", "key": { - "X": { - "tag": "forge:rods/silver" - } + "X": "#forge:rods/silver" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/silver_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_bars_recycling.json index ddf69ba96..30959b9b5 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:silver_bars" - }, + "ingredient": "basemetals:silver_bars", "result": { "count": 3, "id": "basemetals:silver_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/silver_block.json b/src/generated/resources/data/basemetals/recipe/silver_block.json index baa06760d..fdb83e58b 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_block.json +++ b/src/generated/resources/data/basemetals/recipe/silver_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_block", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json index cdb687e83..44332d98d 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/silver" - }, + "ingredient": "#forge:storage_blocks/silver", "result": { "count": 9, "id": "basemetals:silver_powder" diff --git a/src/generated/resources/data/basemetals/recipe/silver_block_ingot.json b/src/generated/resources/data/basemetals/recipe/silver_block_ingot.json index 65d0ca438..953b335dd 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/silver_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:silver_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/silver" - } + "#forge:storage_blocks/silver" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/silver_bolt.json b/src/generated/resources/data/basemetals/recipe/silver_bolt.json index c2e7106ae..634b58f84 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/silver" - } + "F": "minecraft:feather", + "R": "#forge:rods/silver" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/silver_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_bolt_recycling.json index c5b401f6d..fe7300ef9 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:silver_bolt" - }, + "ingredient": "basemetals:silver_bolt", "result": { "count": 2, "id": "basemetals:silver_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/silver_boots.json b/src/generated/resources/data/basemetals/recipe/silver_boots.json index 41b4e5292..be6f69f0b 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_boots.json +++ b/src/generated/resources/data/basemetals/recipe/silver_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:silver_boots", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_boots_plate_repair.json index cf0863df2..d4a9608d7 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/silver_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/silver" - }, + "plate": "#forge:plates/silver", "target": "basemetals:silver_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_boots_recycling.json index 95f7508cf..811af8ce6 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_boots" - }, + "ingredient": "basemetals:silver_boots", "result": { "count": 4, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_bow.json b/src/generated/resources/data/basemetals/recipe/silver_bow.json index 2ce1d0d73..bf2cbfb02 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bow.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_bow", "key": { - "R": { - "tag": "forge:rods/silver" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/silver", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/silver_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_bow_recycling.json index d87d2decc..ab3adaf46 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_bow" - }, + "ingredient": "basemetals:silver_bow", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_button.json b/src/generated/resources/data/basemetals/recipe/silver_button.json index 8282fe2db..04fa50932 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_button.json +++ b/src/generated/resources/data/basemetals/recipe/silver_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_button", "key": { - "X": { - "tag": "forge:nuggets/silver" - } + "X": "#forge:nuggets/silver" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_button_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_button_recycling.json index f2fbbdd3e..ab7aeea11 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:silver_button" - }, + "ingredient": "basemetals:silver_button", "result": { "count": 2, "id": "basemetals:silver_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/silver_chestplate.json b/src/generated/resources/data/basemetals/recipe/silver_chestplate.json index 924fb7557..ba5de8311 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/silver_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:silver_chestplate", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_chestplate_plate_repair.json index 0c2254b94..5878b930e 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/silver_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/silver" - }, + "plate": "#forge:plates/silver", "target": "basemetals:silver_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_chestplate_recycling.json index 3a16a0c90..bb20c74e0 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_chestplate" - }, + "ingredient": "basemetals:silver_chestplate", "result": { "count": 8, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_crackhammer.json b/src/generated/resources/data/basemetals/recipe/silver_crackhammer.json index fbc595a51..e3a29e35d 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/silver_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/silver" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_crackhammer_recycling.json index a816407de..f0e21bdd3 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:silver_crackhammer" - }, + "ingredient": "basemetals:silver_crackhammer", "result": { "id": "basemetals:silver_block" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_crossbow.json b/src/generated/resources/data/basemetals/recipe/silver_crossbow.json index 2c4a4eaa7..b92cf5db8 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/silver_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:silver_crossbow", "key": { - "G": { - "tag": "forge:gears/silver" - }, - "R": { - "tag": "forge:rods/silver" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/silver", + "R": "#forge:rods/silver", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/silver_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_crossbow_recycling.json index c28f3fc83..3732c80b1 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_crossbow" - }, + "ingredient": "basemetals:silver_crossbow", "result": { "count": 4, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_door.json b/src/generated/resources/data/basemetals/recipe/silver_door.json index b27acf9f4..180a9b6d0 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_door.json +++ b/src/generated/resources/data/basemetals/recipe/silver_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_door", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_door_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_door_recycling.json index 2b861a745..c45890eb7 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_door" - }, + "ingredient": "basemetals:silver_door", "result": { "count": 2, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_fishingrod.json b/src/generated/resources/data/basemetals/recipe/silver_fishingrod.json index 647fdbbad..3b6d3cddd 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/silver_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_fishing_rod", "key": { - "R": { - "tag": "forge:rods/silver" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/silver", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/silver_gear.json b/src/generated/resources/data/basemetals/recipe/silver_gear.json index d918ee336..a8714cd56 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_gear.json +++ b/src/generated/resources/data/basemetals/recipe/silver_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:silver_gear", "key": { - "R": { - "tag": "forge:rods/silver" - }, - "X": { - "tag": "forge:ingots/silver" - } + "R": "#forge:rods/silver", + "X": "#forge:ingots/silver" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/silver_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_gear_recycling.json index 975b588a8..d65fd3536 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_gear" - }, + "ingredient": "basemetals:silver_gear", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_helmet.json b/src/generated/resources/data/basemetals/recipe/silver_helmet.json index 7f5177af3..cf76519a6 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/silver_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:silver_helmet", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_helmet_plate_repair.json index b143bf99a..4cab4b18d 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/silver_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/silver" - }, + "plate": "#forge:plates/silver", "target": "basemetals:silver_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_helmet_recycling.json index 0503be018..defc87358 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_helmet" - }, + "ingredient": "basemetals:silver_helmet", "result": { "count": 5, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_hoe.json b/src/generated/resources/data/basemetals/recipe/silver_hoe.json index ed7878179..0a64dbb90 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/silver_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/silver" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_hoe_recycling.json index ca9dd882a..b045736be 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_hoe" - }, + "ingredient": "basemetals:silver_hoe", "result": { "count": 2, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_horsearmor.json b/src/generated/resources/data/basemetals/recipe/silver_horsearmor.json index 2ee54efce..2ebecdb8b 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/silver_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/silver" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/silver" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json index bda56254a..e0f316dec 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/silver" - }, + "ingredient": "#forge:ingots/silver", "result": { "id": "basemetals:silver_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/silver_ingot_from_nuggets.json index 391f23127..7e1f178fc 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:silver_ingot", "key": { - "X": { - "tag": "forge:nuggets/silver" - } + "X": "#forge:nuggets/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_leggings.json b/src/generated/resources/data/basemetals/recipe/silver_leggings.json index 7ad6d4385..d15f2cf26 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/silver_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:silver_leggings", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_leggings_plate_repair.json index f9720ebe6..4f24c57e4 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/silver_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/silver" - }, + "plate": "#forge:plates/silver", "target": "basemetals:silver_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_leggings_recycling.json index 962bb9015..a5e18a3d2 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_leggings" - }, + "ingredient": "basemetals:silver_leggings", "result": { "count": 7, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_lever.json b/src/generated/resources/data/basemetals/recipe/silver_lever.json index 274189ba1..fdb4c97b5 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_lever.json +++ b/src/generated/resources/data/basemetals/recipe/silver_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:silver_lever", "key": { - "R": { - "tag": "forge:rods/silver" - }, - "X": { - "tag": "forge:ingots/silver" - } + "R": "#forge:rods/silver", + "X": "#forge:ingots/silver" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/silver_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_lever_recycling.json index b07ff5829..1f8445c55 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_lever" - }, + "ingredient": "basemetals:silver_lever", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json index 2d8d544b9..b12d200b4 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/silver" - }, + "ingredient": "#forge:nuggets/silver", "result": { "id": "basemetals:silver_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_nuggets.json b/src/generated/resources/data/basemetals/recipe/silver_nuggets.json index 2ea383d9d..4414ecba5 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/silver_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:silver_nugget", "ingredients": [ - { - "tag": "forge:ingots/silver" - } + "#forge:ingots/silver" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/silver_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/silver_ore_blasting.json index d59ac6d0f..96a97e253 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "tag": "forge:ores/silver" - }, + "ingredient": "#forge:ores/silver", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json index c6dd52a3d..4fd049679 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/silver" - }, + "ingredient": "#forge:ores/silver", "result": { "count": 2, "id": "basemetals:silver_powder" diff --git a/src/generated/resources/data/basemetals/recipe/silver_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_ore_smelting.json index b7620ff14..11a4bdc08 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/silver_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "tag": "forge:ores/silver" - }, + "ingredient": "#forge:ores/silver", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_pickaxe.json b/src/generated/resources/data/basemetals/recipe/silver_pickaxe.json index fe44fbbbe..65725a4da 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/silver_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_pickaxe_recycling.json index d2cb64cd9..1f0d633fb 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_pickaxe" - }, + "ingredient": "basemetals:silver_pickaxe", "result": { "count": 3, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_plate.json b/src/generated/resources/data/basemetals/recipe/silver_plate.json index 3745ebecc..3d4cf0a73 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_plate.json +++ b/src/generated/resources/data/basemetals/recipe/silver_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_plate", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/silver_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_plate_recycling.json index 2ad56b11d..9f9b12336 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_plate" - }, + "ingredient": "basemetals:silver_plate", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/silver_powder_from_small.json index 4bdebfae1..e7b92e4d8 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/silver_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:silver_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/silver" - } + "X": "#forge:tiny_dusts/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_powder_smelting.json index 8de6238d4..969d07fe8 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/silver_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "tag": "forge:dusts/silver" - }, + "ingredient": "#forge:dusts/silver", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/silver_pressure_plate.json index 334992705..8d898ced9 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/silver_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/silver_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_pressure_plate_recycling.json index 65d5b1b2f..0e595fc9f 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_pressure_plate" - }, + "ingredient": "basemetals:silver_pressure_plate", "result": { "count": 2, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/silver_raw_blasting.json index 8377e0cd1..b7b8ab589 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/silver_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.6, - "ingredient": { - "tag": "forge:raw_materials/silver" - }, + "ingredient": "#forge:raw_materials/silver", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json index cff4ba56c..600220296 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/silver_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/silver" - }, + "ingredient": "#forge:raw_materials/silver", "result": { "id": "basemetals:silver_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_raw_smelting.json index f430aefc5..a5d3c216a 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/silver_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "tag": "forge:raw_materials/silver" - }, + "ingredient": "#forge:raw_materials/silver", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_rod.json b/src/generated/resources/data/basemetals/recipe/silver_rod.json index 3dbf9990f..262e4501a 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_rod.json +++ b/src/generated/resources/data/basemetals/recipe/silver_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:silver_rod", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_rod_recycling.json index d9683dbdc..2f2a0a7f7 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:silver_rod" - }, + "ingredient": "basemetals:silver_rod", "result": { "count": 4, "id": "basemetals:silver_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/silver_scythe.json b/src/generated/resources/data/basemetals/recipe/silver_scythe.json index 0152183a6..65ed4e095 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/silver_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/silver" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/silver_shears.json b/src/generated/resources/data/basemetals/recipe/silver_shears.json index eb5c3dbcd..285c560a3 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_shears.json +++ b/src/generated/resources/data/basemetals/recipe/silver_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:silver_shears", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_shears_recycling.json index dd65ab0f0..50d148976 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_shears" - }, + "ingredient": "basemetals:silver_shears", "result": { "count": 2, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_shield.json b/src/generated/resources/data/basemetals/recipe/silver_shield.json index e089d0acc..ee34c7b8f 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_shield.json +++ b/src/generated/resources/data/basemetals/recipe/silver_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/silver" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/silver" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/silver_shield_plate_repair.json index dc8eda3ba..3086ff08d 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/silver_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/silver" - }, + "plate": "#forge:plates/silver", "target": "basemetals:silver_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/silver_shovel.json b/src/generated/resources/data/basemetals/recipe/silver_shovel.json index 246ed84e8..5a5821f2b 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/silver_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/silver" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_shovel_recycling.json index 8fd232a24..2785a57e0 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_shovel" - }, + "ingredient": "basemetals:silver_shovel", "result": { "id": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_slab.json b/src/generated/resources/data/basemetals/recipe/silver_slab.json index 34af70d28..eb639b1b7 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_slab.json +++ b/src/generated/resources/data/basemetals/recipe/silver_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_slab", "key": { - "X": { - "tag": "forge:storage_blocks/silver" - } + "X": "#forge:storage_blocks/silver" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/silver_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_slab_recycling.json index e44daec0a..0439e5264 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "item": "basemetals:silver_slab" - }, + "ingredient": "basemetals:silver_slab", "result": { "count": 4, "id": "basemetals:silver_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/silver_smallpowder.json b/src/generated/resources/data/basemetals/recipe/silver_smallpowder.json index 5a4c2e8d2..70088dc59 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/silver_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:silver_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/silver" - } + "#forge:dusts/silver" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/silver_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/silver_smallpowder_smelting.json index 82f3e9922..fc9edd5b2 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/silver_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.07, - "ingredient": { - "tag": "forge:tiny_dusts/silver" - }, + "ingredient": "#forge:tiny_dusts/silver", "result": { "id": "basemetals:silver_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/silver_stairs.json b/src/generated/resources/data/basemetals/recipe/silver_stairs.json index 25b4180fd..a29433805 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/silver_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/silver" - } + "X": "#forge:storage_blocks/silver" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/silver_sword.json b/src/generated/resources/data/basemetals/recipe/silver_sword.json index 4e0bb6c40..b52ce47d8 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_sword.json +++ b/src/generated/resources/data/basemetals/recipe/silver_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:silver_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/silver" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/silver" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/silver_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_sword_recycling.json index e2f2460d5..42d69a70b 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_sword" - }, + "ingredient": "basemetals:silver_sword", "result": { "count": 2, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_trapdoor.json b/src/generated/resources/data/basemetals/recipe/silver_trapdoor.json index 18eb2ea53..bdc7cd3cb 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/silver_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_trapdoor", "key": { - "X": { - "tag": "forge:ingots/silver" - } + "X": "#forge:ingots/silver" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_trapdoor_recycling.json index f19fb5adb..2baa65cfd 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.6, - "ingredient": { - "item": "basemetals:silver_trapdoor" - }, + "ingredient": "basemetals:silver_trapdoor", "result": { "count": 4, "id": "basemetals:silver_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/silver_wall.json b/src/generated/resources/data/basemetals/recipe/silver_wall.json index 25143b20d..2c1f6f48a 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_wall.json +++ b/src/generated/resources/data/basemetals/recipe/silver_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:silver_wall", "key": { - "X": { - "tag": "forge:storage_blocks/silver" - } + "X": "#forge:storage_blocks/silver" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/silver_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/silver_wall_recycling.json index d5b877913..867a2512e 100644 --- a/src/generated/resources/data/basemetals/recipe/silver_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/silver_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:silver_wall" - }, + "ingredient": "basemetals:silver_wall", "result": { "id": "basemetals:silver_block" } diff --git a/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json b/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json index 5aa4ccd20..20875d40b 100644 --- a/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/slime_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:slime_block" - }, + "ingredient": "minecraft:slime_block", "result": { "count": 9, "id": "minecraft:slime_ball" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_arrow.json b/src/generated/resources/data/basemetals/recipe/starsteel_arrow.json index 81f49e457..bf14aee08 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:starsteel_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/starsteel" - }, - "R": { - "tag": "forge:rods/starsteel" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/starsteel", + "R": "#forge:rods/starsteel" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_arrow_recycling.json index daab6bcc7..922e6e573 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "item": "basemetals:starsteel_arrow" - }, + "ingredient": "basemetals:starsteel_arrow", "result": { "id": "basemetals:starsteel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_axe.json b/src/generated/resources/data/basemetals/recipe/starsteel_axe.json index dbf18589f..b45229448 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_axe.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/starsteel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_axe_recycling.json index 69552dc2c..2a8eeff3f 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_axe" - }, + "ingredient": "basemetals:starsteel_axe", "result": { "count": 3, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bars.json b/src/generated/resources/data/basemetals/recipe/starsteel_bars.json index e5a085fba..e1c4a6acb 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bars.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_bars", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bars_2.json b/src/generated/resources/data/basemetals/recipe/starsteel_bars_2.json index 36c2c814c..b74b60a34 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_bars", "key": { - "X": { - "tag": "forge:rods/starsteel" - } + "X": "#forge:rods/starsteel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_bars_recycling.json index 0457e1980..d17709356 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "item": "basemetals:starsteel_bars" - }, + "ingredient": "basemetals:starsteel_bars", "result": { "count": 3, "id": "basemetals:starsteel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_block.json b/src/generated/resources/data/basemetals/recipe/starsteel_block.json index d2a2b2461..e2586df19 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_block.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_block", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json index cabffc120..28ba567aa 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/starsteel" - }, + "ingredient": "#forge:storage_blocks/starsteel", "result": { "count": 9, "id": "basemetals:starsteel_powder" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/starsteel_block_ingot.json index 14aef9a75..ad3542bfd 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:starsteel_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/starsteel" - } + "#forge:storage_blocks/starsteel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bolt.json b/src/generated/resources/data/basemetals/recipe/starsteel_bolt.json index ed57da496..296d93956 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/starsteel" - } + "F": "minecraft:feather", + "R": "#forge:rods/starsteel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_bolt_recycling.json index d8909d3ee..1f8355dc7 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "item": "basemetals:starsteel_bolt" - }, + "ingredient": "basemetals:starsteel_bolt", "result": { "count": 2, "id": "basemetals:starsteel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_boots.json b/src/generated/resources/data/basemetals/recipe/starsteel_boots.json index 21d7dfd9c..03d3cdaaf 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_boots.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:starsteel_boots", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_boots_plate_repair.json index 60523c324..e527cb004 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/starsteel" - }, + "plate": "#forge:plates/starsteel", "target": "basemetals:starsteel_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_boots_recycling.json index 21a075182..45c4032b7 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_boots" - }, + "ingredient": "basemetals:starsteel_boots", "result": { "count": 4, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bow.json b/src/generated/resources/data/basemetals/recipe/starsteel_bow.json index 433d24d9d..32c730721 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bow.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_bow", "key": { - "R": { - "tag": "forge:rods/starsteel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/starsteel", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_bow_recycling.json index 2e28ff402..ebef69b6b 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_bow" - }, + "ingredient": "basemetals:starsteel_bow", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_button.json b/src/generated/resources/data/basemetals/recipe/starsteel_button.json index e127b748d..056569f82 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_button.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_button", "key": { - "X": { - "tag": "forge:nuggets/starsteel" - } + "X": "#forge:nuggets/starsteel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_button_recycling.json index e1b08912f..53f0f9cc0 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "item": "basemetals:starsteel_button" - }, + "ingredient": "basemetals:starsteel_button", "result": { "count": 2, "id": "basemetals:starsteel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_chestplate.json b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate.json index b827315d2..c2c971465 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:starsteel_chestplate", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_plate_repair.json index 618361c2d..5bdaedd5a 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/starsteel" - }, + "plate": "#forge:plates/starsteel", "target": "basemetals:starsteel_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_recycling.json index cb23cf0a7..f1d9e45b0 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_chestplate" - }, + "ingredient": "basemetals:starsteel_chestplate", "result": { "count": 8, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer.json index 9784d4307..0ece15b7b 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/starsteel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer_recycling.json index 88d21ada7..d0c5662a2 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:starsteel_crackhammer" - }, + "ingredient": "basemetals:starsteel_crackhammer", "result": { "id": "basemetals:starsteel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_crossbow.json b/src/generated/resources/data/basemetals/recipe/starsteel_crossbow.json index c00b7c928..084ebeb72 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:starsteel_crossbow", "key": { - "G": { - "tag": "forge:gears/starsteel" - }, - "R": { - "tag": "forge:rods/starsteel" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/starsteel", + "R": "#forge:rods/starsteel", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_crossbow_recycling.json index 94ecd4e73..cee0f911e 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_crossbow" - }, + "ingredient": "basemetals:starsteel_crossbow", "result": { "count": 4, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_door.json b/src/generated/resources/data/basemetals/recipe/starsteel_door.json index a9b6857e0..da9452e72 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_door.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_door", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_door_recycling.json index 592e5c599..8bd703e7c 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_door" - }, + "ingredient": "basemetals:starsteel_door", "result": { "count": 2, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/starsteel_fishingrod.json index 7c4463eb6..dc547e835 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_fishing_rod", "key": { - "R": { - "tag": "forge:rods/starsteel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/starsteel", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_gear.json b/src/generated/resources/data/basemetals/recipe/starsteel_gear.json index 03527d2d0..13a08aec7 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_gear.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:starsteel_gear", "key": { - "R": { - "tag": "forge:rods/starsteel" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "R": "#forge:rods/starsteel", + "X": "#forge:ingots/starsteel" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_gear_recycling.json index 69102313f..ab3f9ac54 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_gear" - }, + "ingredient": "basemetals:starsteel_gear", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_helmet.json b/src/generated/resources/data/basemetals/recipe/starsteel_helmet.json index cd0ea7131..bb165240a 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:starsteel_helmet", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_helmet_plate_repair.json index ba94de54f..5af693856 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/starsteel" - }, + "plate": "#forge:plates/starsteel", "target": "basemetals:starsteel_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_helmet_recycling.json index fb87c558e..08bfa8756 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_helmet" - }, + "ingredient": "basemetals:starsteel_helmet", "result": { "count": 5, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_hoe.json b/src/generated/resources/data/basemetals/recipe/starsteel_hoe.json index 25a3d1f77..4d07b37eb 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/starsteel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_hoe_recycling.json index 3439326c1..0674fb874 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_hoe" - }, + "ingredient": "basemetals:starsteel_hoe", "result": { "count": 2, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/starsteel_horsearmor.json index 8584368dc..4e21e213a 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/starsteel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json index a0d8af573..4ce546234 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/starsteel" - }, + "ingredient": "#forge:ingots/starsteel", "result": { "id": "basemetals:starsteel_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_from_nuggets.json index 21d211669..85816019b 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:starsteel_ingot", "key": { - "X": { - "tag": "forge:nuggets/starsteel" - } + "X": "#forge:nuggets/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_leggings.json b/src/generated/resources/data/basemetals/recipe/starsteel_leggings.json index 06960d6b6..6ac9185ba 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:starsteel_leggings", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_leggings_plate_repair.json index ebb6bfb32..852c704aa 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/starsteel" - }, + "plate": "#forge:plates/starsteel", "target": "basemetals:starsteel_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_leggings_recycling.json index 38f135741..74d6d776e 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_leggings" - }, + "ingredient": "basemetals:starsteel_leggings", "result": { "count": 7, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_lever.json b/src/generated/resources/data/basemetals/recipe/starsteel_lever.json index 9d01091de..de80c3fb9 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_lever.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:starsteel_lever", "key": { - "R": { - "tag": "forge:rods/starsteel" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "R": "#forge:rods/starsteel", + "X": "#forge:ingots/starsteel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_lever_recycling.json index 5fa89af6c..5786cc031 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_lever" - }, + "ingredient": "basemetals:starsteel_lever", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json index 00b5d062e..51be054b0 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/starsteel" - }, + "ingredient": "#forge:nuggets/starsteel", "result": { "id": "basemetals:starsteel_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_nuggets.json b/src/generated/resources/data/basemetals/recipe/starsteel_nuggets.json index 5e1ca11d5..f780fe638 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:starsteel_nugget", "ingredients": [ - { - "tag": "forge:ingots/starsteel" - } + "#forge:ingots/starsteel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_blasting.json index d8216ff22..dffa30bc7 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 1.2, - "ingredient": { - "tag": "forge:ores/starsteel" - }, + "ingredient": "#forge:ores/starsteel", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json index cf8ab2809..9c1f54605 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/starsteel" - }, + "ingredient": "#forge:ores/starsteel", "result": { "count": 2, "id": "basemetals:starsteel_powder" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_ore_smelting.json index 484bbda9c..8a588620e 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "tag": "forge:ores/starsteel" - }, + "ingredient": "#forge:ores/starsteel", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe.json index bad71a913..45a5c8bfe 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe_recycling.json index 8e26b3e5f..204453389 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_pickaxe" - }, + "ingredient": "basemetals:starsteel_pickaxe", "result": { "count": 3, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_plate.json b/src/generated/resources/data/basemetals/recipe/starsteel_plate.json index db5a856d0..921677d1f 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_plate.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_plate", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_plate_recycling.json index eda1d3898..d5e97fcff 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_plate" - }, + "ingredient": "basemetals:starsteel_plate", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/starsteel_powder_from_small.json index c557ca480..26ad4b84b 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:starsteel_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/starsteel" - } + "X": "#forge:tiny_dusts/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_powder_smelting.json index 3a2036ce4..1b7084b0d 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "tag": "forge:dusts/starsteel" - }, + "ingredient": "#forge:dusts/starsteel", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate.json index 1a3a9235d..79e50c268 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate_recycling.json index 03a10c507..3e2b9fdbb 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_pressure_plate" - }, + "ingredient": "basemetals:starsteel_pressure_plate", "result": { "count": 2, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_blasting.json index ead7b8c27..3e06c3bd1 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 1.2, - "ingredient": { - "tag": "forge:raw_materials/starsteel" - }, + "ingredient": "#forge:raw_materials/starsteel", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json index 52597c670..1cc4ec729 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/starsteel" - }, + "ingredient": "#forge:raw_materials/starsteel", "result": { "id": "basemetals:starsteel_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_raw_smelting.json index 6d8597c61..8cf143ea1 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "tag": "forge:raw_materials/starsteel" - }, + "ingredient": "#forge:raw_materials/starsteel", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_rod.json b/src/generated/resources/data/basemetals/recipe/starsteel_rod.json index 1eac9aaa2..ea01383b9 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_rod.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:starsteel_rod", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_rod_recycling.json index 10c8d53a7..2210f817e 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "item": "basemetals:starsteel_rod" - }, + "ingredient": "basemetals:starsteel_rod", "result": { "count": 4, "id": "basemetals:starsteel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_scythe.json b/src/generated/resources/data/basemetals/recipe/starsteel_scythe.json index d10701e53..6640bf0f5 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/starsteel" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_shears.json b/src/generated/resources/data/basemetals/recipe/starsteel_shears.json index b661e7ff2..bc3d1f1d6 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_shears.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:starsteel_shears", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_shears_recycling.json index 7820b7981..59b83c7eb 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_shears" - }, + "ingredient": "basemetals:starsteel_shears", "result": { "count": 2, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_shield.json b/src/generated/resources/data/basemetals/recipe/starsteel_shield.json index 3c037d87f..e9c3f916c 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_shield.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/starsteel" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/starsteel_shield_plate_repair.json index d3deece37..edec97f57 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/starsteel" - }, + "plate": "#forge:plates/starsteel", "target": "basemetals:starsteel_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_shovel.json b/src/generated/resources/data/basemetals/recipe/starsteel_shovel.json index a4ba6b74f..226749681 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/starsteel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_shovel_recycling.json index ed1c264de..1519651e8 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_shovel" - }, + "ingredient": "basemetals:starsteel_shovel", "result": { "id": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_slab.json b/src/generated/resources/data/basemetals/recipe/starsteel_slab.json index e670be270..644217ef9 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_slab.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_slab", "key": { - "X": { - "tag": "forge:storage_blocks/starsteel" - } + "X": "#forge:storage_blocks/starsteel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_slab_recycling.json index 7d8466dfa..8974fc3c3 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "item": "basemetals:starsteel_slab" - }, + "ingredient": "basemetals:starsteel_slab", "result": { "count": 4, "id": "basemetals:starsteel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder.json index 164fa4971..16cce3b27 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:starsteel_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/starsteel" - } + "#forge:dusts/starsteel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder_smelting.json index f8734f471..224d1a789 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.13, - "ingredient": { - "tag": "forge:tiny_dusts/starsteel" - }, + "ingredient": "#forge:tiny_dusts/starsteel", "result": { "id": "basemetals:starsteel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_stairs.json b/src/generated/resources/data/basemetals/recipe/starsteel_stairs.json index a1d3c3a57..946414cc8 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/starsteel" - } + "X": "#forge:storage_blocks/starsteel" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_sword.json b/src/generated/resources/data/basemetals/recipe/starsteel_sword.json index c8104bc3e..f3471a8e5 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_sword.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:starsteel_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/starsteel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/starsteel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_sword_recycling.json index 972daabb3..bcc15e76b 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_sword" - }, + "ingredient": "basemetals:starsteel_sword", "result": { "count": 2, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor.json index 116f491b5..aaefb7f17 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_trapdoor", "key": { - "X": { - "tag": "forge:ingots/starsteel" - } + "X": "#forge:ingots/starsteel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor_recycling.json index 97f4751a7..5f5a40f05 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 1.2, - "ingredient": { - "item": "basemetals:starsteel_trapdoor" - }, + "ingredient": "basemetals:starsteel_trapdoor", "result": { "count": 4, "id": "basemetals:starsteel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_wall.json b/src/generated/resources/data/basemetals/recipe/starsteel_wall.json index 7c6f4c54c..237f66779 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_wall.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:starsteel_wall", "key": { - "X": { - "tag": "forge:storage_blocks/starsteel" - } + "X": "#forge:storage_blocks/starsteel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/starsteel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/starsteel_wall_recycling.json index fd1f3450b..71b4647ec 100644 --- a/src/generated/resources/data/basemetals/recipe/starsteel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/starsteel_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:starsteel_wall" - }, + "ingredient": "basemetals:starsteel_wall", "result": { "id": "basemetals:starsteel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_anvil.json b/src/generated/resources/data/basemetals/recipe/steel_anvil.json index 95cbdf6da..bb76bcee2 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_anvil.json +++ b/src/generated/resources/data/basemetals/recipe/steel_anvil.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:steel_anvil", "key": { - "B": { - "tag": "forge:storage_blocks/steel" - }, - "I": { - "tag": "forge:ingots/steel" - } + "B": "#forge:storage_blocks/steel", + "I": "#forge:ingots/steel" }, "pattern": [ "BBB", diff --git a/src/generated/resources/data/basemetals/recipe/steel_arrow.json b/src/generated/resources/data/basemetals/recipe/steel_arrow.json index 0e7f21929..9335cceb9 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/steel_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:steel_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/steel" - }, - "R": { - "tag": "forge:rods/steel" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/steel", + "R": "#forge:rods/steel" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/steel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_arrow_recycling.json index 6fde5d003..012f544c8 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:steel_arrow" - }, + "ingredient": "basemetals:steel_arrow", "result": { "id": "basemetals:steel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_axe.json b/src/generated/resources/data/basemetals/recipe/steel_axe.json index 23b2287ba..b21031233 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_axe.json +++ b/src/generated/resources/data/basemetals/recipe/steel_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_axe_recycling.json index 2d6311d96..a1745cd29 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_axe" - }, + "ingredient": "basemetals:steel_axe", "result": { "count": 3, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_bars.json b/src/generated/resources/data/basemetals/recipe/steel_bars.json index 48357dc40..2a3e06ed8 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bars.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_bars", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_bars_2.json b/src/generated/resources/data/basemetals/recipe/steel_bars_2.json index ff17a0f60..8573882a1 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_bars", "key": { - "X": { - "tag": "forge:rods/steel" - } + "X": "#forge:rods/steel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/steel_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_bars_recycling.json index 74625f12e..331e58904 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:steel_bars" - }, + "ingredient": "basemetals:steel_bars", "result": { "count": 3, "id": "basemetals:steel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/steel_blend.json b/src/generated/resources/data/basemetals/recipe/steel_blend.json index 14aea5934..6292c69d2 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_blend.json +++ b/src/generated/resources/data/basemetals/recipe/steel_blend.json @@ -5,33 +5,15 @@ "category": "misc", "group": "basemetals:steel_blend", "ingredients": [ - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/coal" - } + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/iron", + "#forge:dusts/coal" ], "result": { "count": 8, diff --git a/src/generated/resources/data/basemetals/recipe/steel_blend_from_small.json b/src/generated/resources/data/basemetals/recipe/steel_blend_from_small.json index 56a991b44..9478399fe 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/steel_blend_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_blend", "key": { - "X": { - "tag": "forge:small_blends/steel" - } + "X": "#forge:small_blends/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_blend_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_blend_smelting.json index c79109b26..2841cb939 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/steel_blend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "tag": "forge:blends/steel" - }, + "ingredient": "#forge:blends/steel", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_block.json b/src/generated/resources/data/basemetals/recipe/steel_block.json index 376556b96..2c558c867 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_block.json +++ b/src/generated/resources/data/basemetals/recipe/steel_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_block", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json index 366797e02..fb65594dc 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/steel_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/steel" - }, + "ingredient": "#forge:storage_blocks/steel", "result": { "count": 9, "id": "basemetals:steel_powder" diff --git a/src/generated/resources/data/basemetals/recipe/steel_block_ingot.json b/src/generated/resources/data/basemetals/recipe/steel_block_ingot.json index c891f4690..eaeed0741 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/steel_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/steel" - } + "#forge:storage_blocks/steel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/steel_bolt.json b/src/generated/resources/data/basemetals/recipe/steel_bolt.json index 6b22d8800..e335b0ff5 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/steel" - } + "F": "minecraft:feather", + "R": "#forge:rods/steel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/steel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_bolt_recycling.json index f8770306c..51dcd3f2b 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:steel_bolt" - }, + "ingredient": "basemetals:steel_bolt", "result": { "count": 2, "id": "basemetals:steel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/steel_boots.json b/src/generated/resources/data/basemetals/recipe/steel_boots.json index dca964bad..e4f488d6f 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_boots.json +++ b/src/generated/resources/data/basemetals/recipe/steel_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:steel_boots", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_boots_plate_repair.json index 78c353a27..c69123dbf 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/steel_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/steel" - }, + "plate": "#forge:plates/steel", "target": "basemetals:steel_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_boots_recycling.json index e2c6f6581..02007d7ca 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_boots" - }, + "ingredient": "basemetals:steel_boots", "result": { "count": 4, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_bow.json b/src/generated/resources/data/basemetals/recipe/steel_bow.json index c72f016b0..9ebcb5470 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bow.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_bow", "key": { - "R": { - "tag": "forge:rods/steel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/steel", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/steel_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_bow_recycling.json index eb60e4049..197741bcb 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_bow" - }, + "ingredient": "basemetals:steel_bow", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_button.json b/src/generated/resources/data/basemetals/recipe/steel_button.json index 470650346..7da51abc8 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_button.json +++ b/src/generated/resources/data/basemetals/recipe/steel_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_button", "key": { - "X": { - "tag": "forge:nuggets/steel" - } + "X": "#forge:nuggets/steel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_button_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_button_recycling.json index ce07d239e..923450a3b 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:steel_button" - }, + "ingredient": "basemetals:steel_button", "result": { "count": 2, "id": "basemetals:steel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/steel_chestplate.json b/src/generated/resources/data/basemetals/recipe/steel_chestplate.json index db1a6f235..b2e141382 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/steel_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:steel_chestplate", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_chestplate_plate_repair.json index f97dc5818..f28d4c424 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/steel_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/steel" - }, + "plate": "#forge:plates/steel", "target": "basemetals:steel_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_chestplate_recycling.json index 11385e938..08a6eef22 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_chestplate" - }, + "ingredient": "basemetals:steel_chestplate", "result": { "count": 8, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_crackhammer.json b/src/generated/resources/data/basemetals/recipe/steel_crackhammer.json index 9a237b6ef..b5f958015 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/steel_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/steel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_crackhammer_recycling.json index bf59e5ea5..29aff5e1e 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:steel_crackhammer" - }, + "ingredient": "basemetals:steel_crackhammer", "result": { "id": "basemetals:steel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_crossbow.json b/src/generated/resources/data/basemetals/recipe/steel_crossbow.json index 4b3d721cc..66b0542e4 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/steel_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:steel_crossbow", "key": { - "G": { - "tag": "forge:gears/steel" - }, - "R": { - "tag": "forge:rods/steel" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/steel", + "R": "#forge:rods/steel", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/steel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_crossbow_recycling.json index 9403e0a90..2249ab9ee 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_crossbow" - }, + "ingredient": "basemetals:steel_crossbow", "result": { "count": 4, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_door.json b/src/generated/resources/data/basemetals/recipe/steel_door.json index af3b55f7a..c6f839697 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_door.json +++ b/src/generated/resources/data/basemetals/recipe/steel_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_door", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_door_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_door_recycling.json index 79c433799..a23e49646 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_door" - }, + "ingredient": "basemetals:steel_door", "result": { "count": 2, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_fishingrod.json b/src/generated/resources/data/basemetals/recipe/steel_fishingrod.json index 7ab639441..256da8adb 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/steel_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_fishing_rod", "key": { - "R": { - "tag": "forge:rods/steel" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/steel", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/steel_gear.json b/src/generated/resources/data/basemetals/recipe/steel_gear.json index db2dbaa2d..c0790b328 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_gear.json +++ b/src/generated/resources/data/basemetals/recipe/steel_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:steel_gear", "key": { - "R": { - "tag": "forge:rods/steel" - }, - "X": { - "tag": "forge:ingots/steel" - } + "R": "#forge:rods/steel", + "X": "#forge:ingots/steel" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/steel_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_gear_recycling.json index b48c89665..2c94f1399 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_gear" - }, + "ingredient": "basemetals:steel_gear", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_helmet.json b/src/generated/resources/data/basemetals/recipe/steel_helmet.json index 2edfcb938..d6b43b24f 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/steel_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:steel_helmet", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_helmet_plate_repair.json index 5e2f9a09c..cad104fb5 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/steel_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/steel" - }, + "plate": "#forge:plates/steel", "target": "basemetals:steel_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_helmet_recycling.json index 3c300e8ab..073640174 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_helmet" - }, + "ingredient": "basemetals:steel_helmet", "result": { "count": 5, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_hoe.json b/src/generated/resources/data/basemetals/recipe/steel_hoe.json index d030b3075..ca61bfb92 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/steel_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_hoe_recycling.json index e435c345e..7a66ea32d 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_hoe" - }, + "ingredient": "basemetals:steel_hoe", "result": { "count": 2, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_horsearmor.json b/src/generated/resources/data/basemetals/recipe/steel_horsearmor.json index fb40077d0..07b5e0a50 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/steel_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/steel" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/steel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json index 6cd51a59c..446ac6f5e 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/steel_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/steel" - }, + "ingredient": "#forge:ingots/steel", "result": { "id": "basemetals:steel_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/steel_ingot_from_nuggets.json index 71bc21ef0..32973f009 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/steel_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_ingot", "key": { - "X": { - "tag": "forge:nuggets/steel" - } + "X": "#forge:nuggets/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_leggings.json b/src/generated/resources/data/basemetals/recipe/steel_leggings.json index bcc0a7d57..6cc9aaa89 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/steel_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:steel_leggings", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_leggings_plate_repair.json index b1e026828..d63b9a8bd 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/steel_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/steel" - }, + "plate": "#forge:plates/steel", "target": "basemetals:steel_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_leggings_recycling.json index f7ca3261e..08a5496b1 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_leggings" - }, + "ingredient": "basemetals:steel_leggings", "result": { "count": 7, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_lever.json b/src/generated/resources/data/basemetals/recipe/steel_lever.json index 823fa9f75..eb1a16b4c 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_lever.json +++ b/src/generated/resources/data/basemetals/recipe/steel_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:steel_lever", "key": { - "R": { - "tag": "forge:rods/steel" - }, - "X": { - "tag": "forge:ingots/steel" - } + "R": "#forge:rods/steel", + "X": "#forge:ingots/steel" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/steel_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_lever_recycling.json index 6cefd0b8d..4ef9cb31b 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_lever" - }, + "ingredient": "basemetals:steel_lever", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json index dc5166b05..b636decbb 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/steel_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/steel" - }, + "ingredient": "#forge:nuggets/steel", "result": { "id": "basemetals:steel_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_nuggets.json b/src/generated/resources/data/basemetals/recipe/steel_nuggets.json index 4d81a67f0..353263bfd 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/steel_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_nugget", "ingredients": [ - { - "tag": "forge:ingots/steel" - } + "#forge:ingots/steel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/steel_pickaxe.json b/src/generated/resources/data/basemetals/recipe/steel_pickaxe.json index 93b1b5400..1d86e5003 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/steel_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_pickaxe_recycling.json index 0e3b49154..7ec92e6f1 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_pickaxe" - }, + "ingredient": "basemetals:steel_pickaxe", "result": { "count": 3, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_plate.json b/src/generated/resources/data/basemetals/recipe/steel_plate.json index 96727bef4..854bd3cea 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_plate.json +++ b/src/generated/resources/data/basemetals/recipe/steel_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_plate", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/steel_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_plate_recycling.json index a1d89bc86..b5925deb9 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_plate" - }, + "ingredient": "basemetals:steel_plate", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/steel_powder_from_small.json index 0d450a843..59610c57d 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/steel_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/steel" - } + "X": "#forge:tiny_dusts/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_powder_smelting.json index c289b1baf..bb18c37ea 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/steel_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "tag": "forge:dusts/steel" - }, + "ingredient": "#forge:dusts/steel", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/steel_pressure_plate.json index c5f09013b..b30c21627 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/steel_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/steel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_pressure_plate_recycling.json index 0f5b9ca2e..e98b30e63 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_pressure_plate" - }, + "ingredient": "basemetals:steel_pressure_plate", "result": { "count": 2, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_rod.json b/src/generated/resources/data/basemetals/recipe/steel_rod.json index 383f02586..5e15c23fe 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_rod.json +++ b/src/generated/resources/data/basemetals/recipe/steel_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_rod", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_rod_recycling.json index 0528e3980..4fd72b4f1 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:steel_rod" - }, + "ingredient": "basemetals:steel_rod", "result": { "count": 4, "id": "basemetals:steel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/steel_scythe.json b/src/generated/resources/data/basemetals/recipe/steel_scythe.json index 5504757d7..6d9f193ea 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/steel_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/steel_shears.json b/src/generated/resources/data/basemetals/recipe/steel_shears.json index 3db865488..0bf4cb4a8 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_shears.json +++ b/src/generated/resources/data/basemetals/recipe/steel_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:steel_shears", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_shears_recycling.json index 16d6ebb2e..bbafcb886 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_shears" - }, + "ingredient": "basemetals:steel_shears", "result": { "count": 2, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_shield.json b/src/generated/resources/data/basemetals/recipe/steel_shield.json index 4228927d5..e3e15e3ee 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_shield.json +++ b/src/generated/resources/data/basemetals/recipe/steel_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/steel" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/steel" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/steel_shield_plate_repair.json index 3875641d0..13a676728 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/steel_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/steel" - }, + "plate": "#forge:plates/steel", "target": "basemetals:steel_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/steel_shovel.json b/src/generated/resources/data/basemetals/recipe/steel_shovel.json index 233ede944..542f8428f 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/steel_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_shovel_recycling.json index ffb9a7d9a..d25d54fd2 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_shovel" - }, + "ingredient": "basemetals:steel_shovel", "result": { "id": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_slab.json b/src/generated/resources/data/basemetals/recipe/steel_slab.json index bab801af6..37f6a9f04 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_slab.json +++ b/src/generated/resources/data/basemetals/recipe/steel_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_slab", "key": { - "X": { - "tag": "forge:storage_blocks/steel" - } + "X": "#forge:storage_blocks/steel" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/steel_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_slab_recycling.json index 655999b4a..7b8c90647 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:steel_slab" - }, + "ingredient": "basemetals:steel_slab", "result": { "count": 4, "id": "basemetals:steel_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/steel_smallblend.json b/src/generated/resources/data/basemetals/recipe/steel_smallblend.json index 6a95d00c2..e14b06b56 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_smallblend.json +++ b/src/generated/resources/data/basemetals/recipe/steel_smallblend.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_smallblend", "ingredients": [ - { - "tag": "forge:blends/steel" - } + "#forge:blends/steel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/steel_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_smallblend_smelting.json index 0f54c2dd4..414334848 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/steel_smallblend_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "tag": "forge:small_blends/steel" - }, + "ingredient": "#forge:small_blends/steel", "result": { "id": "basemetals:steel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_smallpowder.json b/src/generated/resources/data/basemetals/recipe/steel_smallpowder.json index 6e2da29ea..74f918cf2 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/steel_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:steel_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/steel" - } + "#forge:dusts/steel" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/steel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/steel_smallpowder_smelting.json index f542c822b..ff38eadc7 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/steel_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "tag": "forge:tiny_dusts/steel" - }, + "ingredient": "#forge:tiny_dusts/steel", "result": { "id": "basemetals:steel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/steel_stairs.json b/src/generated/resources/data/basemetals/recipe/steel_stairs.json index 2078ec097..f37e03dde 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/steel_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/steel" - } + "X": "#forge:storage_blocks/steel" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/steel_sword.json b/src/generated/resources/data/basemetals/recipe/steel_sword.json index 328ea204e..0ebae0a0f 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_sword.json +++ b/src/generated/resources/data/basemetals/recipe/steel_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:steel_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/steel" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/steel_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_sword_recycling.json index db9cf984a..e501ecb32 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_sword" - }, + "ingredient": "basemetals:steel_sword", "result": { "count": 2, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_trapdoor.json b/src/generated/resources/data/basemetals/recipe/steel_trapdoor.json index 785709ddb..aa2e7212d 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/steel_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_trapdoor", "key": { - "X": { - "tag": "forge:ingots/steel" - } + "X": "#forge:ingots/steel" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_trapdoor_recycling.json index 384bb4704..8c335c313 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:steel_trapdoor" - }, + "ingredient": "basemetals:steel_trapdoor", "result": { "count": 4, "id": "basemetals:steel_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/steel_wall.json b/src/generated/resources/data/basemetals/recipe/steel_wall.json index 4ad176a9b..ca8a9758b 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_wall.json +++ b/src/generated/resources/data/basemetals/recipe/steel_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:steel_wall", "key": { - "X": { - "tag": "forge:storage_blocks/steel" - } + "X": "#forge:storage_blocks/steel" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/steel_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/steel_wall_recycling.json index 81323fda3..3ec35256b 100644 --- a/src/generated/resources/data/basemetals/recipe/steel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/steel_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:steel_wall" - }, + "ingredient": "basemetals:steel_wall", "result": { "id": "basemetals:steel_block" } diff --git a/src/generated/resources/data/basemetals/recipe/stone_anvil.json b/src/generated/resources/data/basemetals/recipe/stone_anvil.json index b1aa31f0b..815f525cb 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_anvil.json +++ b/src/generated/resources/data/basemetals/recipe/stone_anvil.json @@ -5,15 +5,9 @@ "category": "building", "group": "basemetals:stone_anvil", "key": { - "B": { - "item": "minecraft:stone_bricks" - }, - "C": { - "tag": "forge:stone" - }, - "S": { - "item": "minecraft:stone_slab" - } + "B": "minecraft:stone_bricks", + "C": "#forge:stone", + "S": "minecraft:stone_slab" }, "pattern": [ "BBB", diff --git a/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json index 91dc85f77..2e45f6d1b 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/stone_brick_slab_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:stone_brick_slab" - }, + "ingredient": "minecraft:stone_brick_slab", "result": { "id": "minecraft:cobblestone_slab" } diff --git a/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json index 06b389321..64c896440 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/stone_bricks_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:stone_bricks" - }, + "ingredient": "minecraft:stone_bricks", "result": { "id": "minecraft:cobblestone" } diff --git a/src/generated/resources/data/basemetals/recipe/stone_crackhammer.json b/src/generated/resources/data/basemetals/recipe/stone_crackhammer.json index d367832e4..e88001600 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/stone_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:stone_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "minecraft:stone_bricks" - } + "S": "#forge:rods/wooden", + "X": "minecraft:stone_bricks" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/stone_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_crushing.json index cc0afa14c..ed8e43121 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/stone_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:stone" - }, + "ingredient": "#forge:stone", "result": { "id": "minecraft:cobblestone" } diff --git a/src/generated/resources/data/basemetals/recipe/stone_scythe.json b/src/generated/resources/data/basemetals/recipe/stone_scythe.json index 57402d72e..2be1fa39e 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/stone_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:stone_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:stone" - } + "S": "#forge:rods/wooden", + "X": "#forge:stone" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json b/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json index 1f9e8f969..925a5ada4 100644 --- a/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/stone_slab_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:stone_slab" - }, + "ingredient": "minecraft:stone_slab", "result": { "id": "minecraft:cobblestone_slab" } diff --git a/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json b/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json index ac06da241..aed86fb53 100644 --- a/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/sugar_cane_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "item": "minecraft:sugar_cane" - }, + "ingredient": "minecraft:sugar_cane", "result": { "count": 2, "id": "minecraft:sugar" diff --git a/src/generated/resources/data/basemetals/recipe/tin_arrow.json b/src/generated/resources/data/basemetals/recipe/tin_arrow.json index 551d3bf7e..59170894a 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/tin_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:tin_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/tin" - }, - "R": { - "tag": "forge:rods/tin" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/tin", + "R": "#forge:rods/tin" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/tin_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_arrow_recycling.json index 6814c30bf..8b763135b 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:tin_arrow" - }, + "ingredient": "basemetals:tin_arrow", "result": { "id": "basemetals:tin_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_axe.json b/src/generated/resources/data/basemetals/recipe/tin_axe.json index 5fe22b904..db005c0ba 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_axe.json +++ b/src/generated/resources/data/basemetals/recipe/tin_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/tin" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_axe_recycling.json index 707ce8925..fec311de1 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_axe" - }, + "ingredient": "basemetals:tin_axe", "result": { "count": 3, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_bars.json b/src/generated/resources/data/basemetals/recipe/tin_bars.json index 4628193bf..d94baa654 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bars.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_bars", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_bars_2.json b/src/generated/resources/data/basemetals/recipe/tin_bars_2.json index 1dde6d408..f7038f94e 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_bars", "key": { - "X": { - "tag": "forge:rods/tin" - } + "X": "#forge:rods/tin" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/tin_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_bars_recycling.json index 917ad8da0..075c1cd22 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:tin_bars" - }, + "ingredient": "basemetals:tin_bars", "result": { "count": 3, "id": "basemetals:tin_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/tin_block.json b/src/generated/resources/data/basemetals/recipe/tin_block.json index 4efbac6e8..7322ba327 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_block.json +++ b/src/generated/resources/data/basemetals/recipe/tin_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_block", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json index 52af9a8d4..1b8855964 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/tin" - }, + "ingredient": "#forge:storage_blocks/tin", "result": { "count": 9, "id": "basemetals:tin_powder" diff --git a/src/generated/resources/data/basemetals/recipe/tin_block_ingot.json b/src/generated/resources/data/basemetals/recipe/tin_block_ingot.json index 35f799650..f2739dd5b 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/tin_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:tin_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/tin" - } + "#forge:storage_blocks/tin" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/tin_bolt.json b/src/generated/resources/data/basemetals/recipe/tin_bolt.json index 2ac23678b..b54acbcc1 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/tin" - } + "F": "minecraft:feather", + "R": "#forge:rods/tin" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/tin_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_bolt_recycling.json index da2aa4eb1..12946994e 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:tin_bolt" - }, + "ingredient": "basemetals:tin_bolt", "result": { "count": 2, "id": "basemetals:tin_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/tin_boots.json b/src/generated/resources/data/basemetals/recipe/tin_boots.json index e3870be96..02d0288e6 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_boots.json +++ b/src/generated/resources/data/basemetals/recipe/tin_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:tin_boots", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_boots_plate_repair.json index 1e82a17a4..f2976bba6 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/tin_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/tin" - }, + "plate": "#forge:plates/tin", "target": "basemetals:tin_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_boots_recycling.json index 9d7d89efd..3855727ef 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_boots" - }, + "ingredient": "basemetals:tin_boots", "result": { "count": 4, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_bow.json b/src/generated/resources/data/basemetals/recipe/tin_bow.json index 6cf01be31..579a9299b 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bow.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_bow", "key": { - "R": { - "tag": "forge:rods/tin" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/tin", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/tin_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_bow_recycling.json index 2d9db7874..ee11af864 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_bow" - }, + "ingredient": "basemetals:tin_bow", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_button.json b/src/generated/resources/data/basemetals/recipe/tin_button.json index ad6002b70..3602b1d8f 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_button.json +++ b/src/generated/resources/data/basemetals/recipe/tin_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_button", "key": { - "X": { - "tag": "forge:nuggets/tin" - } + "X": "#forge:nuggets/tin" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_button_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_button_recycling.json index e21eee27f..1b38dd4db 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:tin_button" - }, + "ingredient": "basemetals:tin_button", "result": { "count": 2, "id": "basemetals:tin_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/tin_chestplate.json b/src/generated/resources/data/basemetals/recipe/tin_chestplate.json index fec28fd9d..9530dac32 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/tin_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:tin_chestplate", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_chestplate_plate_repair.json index b6fe68a20..7451d142d 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/tin_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/tin" - }, + "plate": "#forge:plates/tin", "target": "basemetals:tin_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_chestplate_recycling.json index a5bec4eb4..bb9ec5740 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_chestplate" - }, + "ingredient": "basemetals:tin_chestplate", "result": { "count": 8, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_crackhammer.json b/src/generated/resources/data/basemetals/recipe/tin_crackhammer.json index 5cc370b31..0bf2d1de3 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/tin_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/tin" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_crackhammer_recycling.json index 65c2b40d3..ce15b7901 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:tin_crackhammer" - }, + "ingredient": "basemetals:tin_crackhammer", "result": { "id": "basemetals:tin_block" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_crossbow.json b/src/generated/resources/data/basemetals/recipe/tin_crossbow.json index 3d2be0952..14018bcf7 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/tin_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:tin_crossbow", "key": { - "G": { - "tag": "forge:gears/tin" - }, - "R": { - "tag": "forge:rods/tin" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/tin", + "R": "#forge:rods/tin", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/tin_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_crossbow_recycling.json index 9738e4146..346a13dcc 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_crossbow" - }, + "ingredient": "basemetals:tin_crossbow", "result": { "count": 4, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_door.json b/src/generated/resources/data/basemetals/recipe/tin_door.json index df2e218f0..c5f5c1ec8 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_door.json +++ b/src/generated/resources/data/basemetals/recipe/tin_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_door", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_door_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_door_recycling.json index cf6b7dc34..2b3bdf888 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_door" - }, + "ingredient": "basemetals:tin_door", "result": { "count": 2, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_fishingrod.json b/src/generated/resources/data/basemetals/recipe/tin_fishingrod.json index 4b7cce2f2..19b86ec89 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/tin_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_fishing_rod", "key": { - "R": { - "tag": "forge:rods/tin" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/tin", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/tin_gear.json b/src/generated/resources/data/basemetals/recipe/tin_gear.json index 064e0d86c..04ecfb309 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_gear.json +++ b/src/generated/resources/data/basemetals/recipe/tin_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:tin_gear", "key": { - "R": { - "tag": "forge:rods/tin" - }, - "X": { - "tag": "forge:ingots/tin" - } + "R": "#forge:rods/tin", + "X": "#forge:ingots/tin" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/tin_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_gear_recycling.json index 523d3f3ed..6958d0e69 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_gear" - }, + "ingredient": "basemetals:tin_gear", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_helmet.json b/src/generated/resources/data/basemetals/recipe/tin_helmet.json index c3577f1da..7e98add56 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/tin_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:tin_helmet", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_helmet_plate_repair.json index 6f8b37104..accbdc34f 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/tin_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/tin" - }, + "plate": "#forge:plates/tin", "target": "basemetals:tin_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_helmet_recycling.json index d51083a03..af3ae64ed 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_helmet" - }, + "ingredient": "basemetals:tin_helmet", "result": { "count": 5, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_hoe.json b/src/generated/resources/data/basemetals/recipe/tin_hoe.json index bc0c40db2..f2e00bbd5 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/tin_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/tin" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_hoe_recycling.json index 3f66875d5..a631d1046 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_hoe" - }, + "ingredient": "basemetals:tin_hoe", "result": { "count": 2, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_horsearmor.json b/src/generated/resources/data/basemetals/recipe/tin_horsearmor.json index 99ca37cf7..0949127ca 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/tin_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/tin" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/tin" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json index 05d937799..15ecb1903 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/tin" - }, + "ingredient": "#forge:ingots/tin", "result": { "id": "basemetals:tin_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/tin_ingot_from_nuggets.json index ba531003d..2bc366208 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:tin_ingot", "key": { - "X": { - "tag": "forge:nuggets/tin" - } + "X": "#forge:nuggets/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_leggings.json b/src/generated/resources/data/basemetals/recipe/tin_leggings.json index dba836fb3..77010c464 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/tin_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:tin_leggings", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_leggings_plate_repair.json index bc6c32939..7e1beae36 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/tin_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/tin" - }, + "plate": "#forge:plates/tin", "target": "basemetals:tin_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_leggings_recycling.json index d85713d8e..7f17d7022 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_leggings" - }, + "ingredient": "basemetals:tin_leggings", "result": { "count": 7, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_lever.json b/src/generated/resources/data/basemetals/recipe/tin_lever.json index c01ba4baa..bc4b6e3c4 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_lever.json +++ b/src/generated/resources/data/basemetals/recipe/tin_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:tin_lever", "key": { - "R": { - "tag": "forge:rods/tin" - }, - "X": { - "tag": "forge:ingots/tin" - } + "R": "#forge:rods/tin", + "X": "#forge:ingots/tin" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/tin_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_lever_recycling.json index c8f5b63a2..10c87d576 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_lever" - }, + "ingredient": "basemetals:tin_lever", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json index 76d5e424b..75a1c0f68 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/tin" - }, + "ingredient": "#forge:nuggets/tin", "result": { "id": "basemetals:tin_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_nuggets.json b/src/generated/resources/data/basemetals/recipe/tin_nuggets.json index 48d408ce2..f521052ff 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/tin_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:tin_nugget", "ingredients": [ - { - "tag": "forge:ingots/tin" - } + "#forge:ingots/tin" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/tin_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/tin_ore_blasting.json index 4526facfa..9ce42a3b9 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.2, - "ingredient": { - "tag": "forge:ores/tin" - }, + "ingredient": "#forge:ores/tin", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json index 8935fda50..23635616d 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/tin" - }, + "ingredient": "#forge:ores/tin", "result": { "count": 2, "id": "basemetals:tin_powder" diff --git a/src/generated/resources/data/basemetals/recipe/tin_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_ore_smelting.json index cc1f94298..a21c60540 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/tin_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "tag": "forge:ores/tin" - }, + "ingredient": "#forge:ores/tin", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_pickaxe.json b/src/generated/resources/data/basemetals/recipe/tin_pickaxe.json index 8f4c0e298..2a7d07675 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/tin_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_pickaxe_recycling.json index 2c562ccdc..d37390eb5 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_pickaxe" - }, + "ingredient": "basemetals:tin_pickaxe", "result": { "count": 3, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_plate.json b/src/generated/resources/data/basemetals/recipe/tin_plate.json index 8d22c9f56..eb2e29f1e 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_plate.json +++ b/src/generated/resources/data/basemetals/recipe/tin_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_plate", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/tin_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_plate_recycling.json index b91d118fa..82b0d26bc 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_plate" - }, + "ingredient": "basemetals:tin_plate", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/tin_powder_from_small.json index 96a20e0ae..04acea4eb 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/tin_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:tin_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/tin" - } + "X": "#forge:tiny_dusts/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_powder_smelting.json index 9a8f281ad..a0b90ed3b 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/tin_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "tag": "forge:dusts/tin" - }, + "ingredient": "#forge:dusts/tin", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/tin_pressure_plate.json index 8ab7c9a88..e8bedef57 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/tin_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/tin_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_pressure_plate_recycling.json index f0f885c56..c7bedede0 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_pressure_plate" - }, + "ingredient": "basemetals:tin_pressure_plate", "result": { "count": 2, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/tin_raw_blasting.json index 197aaff18..2b765ecd9 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/tin_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.2, - "ingredient": { - "tag": "forge:raw_materials/tin" - }, + "ingredient": "#forge:raw_materials/tin", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json index e54ad7b4d..fb45cfa00 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/tin_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/tin" - }, + "ingredient": "#forge:raw_materials/tin", "result": { "id": "basemetals:tin_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_raw_smelting.json index bc0dc1eee..e51227cde 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/tin_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "tag": "forge:raw_materials/tin" - }, + "ingredient": "#forge:raw_materials/tin", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_rod.json b/src/generated/resources/data/basemetals/recipe/tin_rod.json index 8c9d3ea3e..3e4f93891 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_rod.json +++ b/src/generated/resources/data/basemetals/recipe/tin_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:tin_rod", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_rod_recycling.json index b3838aba5..968633680 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:tin_rod" - }, + "ingredient": "basemetals:tin_rod", "result": { "count": 4, "id": "basemetals:tin_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/tin_scythe.json b/src/generated/resources/data/basemetals/recipe/tin_scythe.json index 358772923..20129b33e 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/tin_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/tin" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/tin_shears.json b/src/generated/resources/data/basemetals/recipe/tin_shears.json index 2417eda8e..6644f4693 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_shears.json +++ b/src/generated/resources/data/basemetals/recipe/tin_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:tin_shears", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_shears_recycling.json index 60d0e8137..34dac1876 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_shears" - }, + "ingredient": "basemetals:tin_shears", "result": { "count": 2, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_shield.json b/src/generated/resources/data/basemetals/recipe/tin_shield.json index 96abf45b1..b25d2e4b2 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_shield.json +++ b/src/generated/resources/data/basemetals/recipe/tin_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/tin" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/tin" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/tin_shield_plate_repair.json index 230a31789..94df5402b 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/tin_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/tin" - }, + "plate": "#forge:plates/tin", "target": "basemetals:tin_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/tin_shovel.json b/src/generated/resources/data/basemetals/recipe/tin_shovel.json index 1edf6911c..17b47e3db 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/tin_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/tin" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_shovel_recycling.json index 0f3cdf00e..111878f7a 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_shovel" - }, + "ingredient": "basemetals:tin_shovel", "result": { "id": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_slab.json b/src/generated/resources/data/basemetals/recipe/tin_slab.json index 46352d0f2..fbbd45c1f 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_slab.json +++ b/src/generated/resources/data/basemetals/recipe/tin_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_slab", "key": { - "X": { - "tag": "forge:storage_blocks/tin" - } + "X": "#forge:storage_blocks/tin" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/tin_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_slab_recycling.json index 41b23a7b1..f617db5bc 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "item": "basemetals:tin_slab" - }, + "ingredient": "basemetals:tin_slab", "result": { "count": 4, "id": "basemetals:tin_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/tin_smallpowder.json b/src/generated/resources/data/basemetals/recipe/tin_smallpowder.json index 05c75c841..ecbac87b4 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/tin_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:tin_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/tin" - } + "#forge:dusts/tin" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/tin_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/tin_smallpowder_smelting.json index dc41bbd92..47d2a46af 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/tin_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.02, - "ingredient": { - "tag": "forge:tiny_dusts/tin" - }, + "ingredient": "#forge:tiny_dusts/tin", "result": { "id": "basemetals:tin_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/tin_stairs.json b/src/generated/resources/data/basemetals/recipe/tin_stairs.json index d5182bbfd..e8bed71e5 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/tin_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/tin" - } + "X": "#forge:storage_blocks/tin" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/tin_sword.json b/src/generated/resources/data/basemetals/recipe/tin_sword.json index c80f39df3..47af7f6b6 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_sword.json +++ b/src/generated/resources/data/basemetals/recipe/tin_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:tin_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/tin" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/tin" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/tin_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_sword_recycling.json index 39c569564..920b8a935 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_sword" - }, + "ingredient": "basemetals:tin_sword", "result": { "count": 2, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_trapdoor.json b/src/generated/resources/data/basemetals/recipe/tin_trapdoor.json index 50df747e3..28df3a105 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/tin_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_trapdoor", "key": { - "X": { - "tag": "forge:ingots/tin" - } + "X": "#forge:ingots/tin" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_trapdoor_recycling.json index 7512eaaeb..d046e1f68 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.2, - "ingredient": { - "item": "basemetals:tin_trapdoor" - }, + "ingredient": "basemetals:tin_trapdoor", "result": { "count": 4, "id": "basemetals:tin_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/tin_wall.json b/src/generated/resources/data/basemetals/recipe/tin_wall.json index e49603b38..9e459f151 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_wall.json +++ b/src/generated/resources/data/basemetals/recipe/tin_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:tin_wall", "key": { - "X": { - "tag": "forge:storage_blocks/tin" - } + "X": "#forge:storage_blocks/tin" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/tin_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/tin_wall_recycling.json index f94d82b5b..5a5f9d6bb 100644 --- a/src/generated/resources/data/basemetals/recipe/tin_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/tin_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:tin_wall" - }, + "ingredient": "basemetals:tin_wall", "result": { "id": "basemetals:tin_block" } diff --git a/src/generated/resources/data/basemetals/recipe/tripwire_hook.json b/src/generated/resources/data/basemetals/recipe/tripwire_hook.json index f34f6be9b..db981eaab 100644 --- a/src/generated/resources/data/basemetals/recipe/tripwire_hook.json +++ b/src/generated/resources/data/basemetals/recipe/tripwire_hook.json @@ -5,15 +5,9 @@ "category": "building", "group": "minecraft:tripwire_hook", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/steel" - } + "S": "#forge:rods/wooden", + "W": "#minecraft:planks", + "X": "#forge:ingots/steel" }, "pattern": [ "X", 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 index 597fbb9fb..8618e3671 100644 --- a/src/generated/resources/data/basemetals/recipe/vanilla_copper_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/vanilla_copper_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.5, - "ingredient": { - "item": "minecraft:copper_trapdoor" - }, + "ingredient": "minecraft:copper_trapdoor", "result": { "count": 3, "id": "minecraft:copper_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/wood_crackhammer.json b/src/generated/resources/data/basemetals/recipe/wood_crackhammer.json index 116ff8cab..dbeaee760 100644 --- a/src/generated/resources/data/basemetals/recipe/wood_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/wood_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:wood_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "minecraft:logs" - } + "S": "#forge:rods/wooden", + "X": "#minecraft:logs" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/wood_scythe.json b/src/generated/resources/data/basemetals/recipe/wood_scythe.json index 077f38473..33631729b 100644 --- a/src/generated/resources/data/basemetals/recipe/wood_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/wood_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:wood_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "minecraft:planks" - } + "S": "#forge:rods/wooden", + "X": "#minecraft:planks" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_arrow.json b/src/generated/resources/data/basemetals/recipe/zinc_arrow.json index 58b288945..d8fb81eea 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_arrow.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_arrow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:zinc_arrow", "key": { - "F": { - "item": "minecraft:feather" - }, - "N": { - "tag": "forge:nuggets/zinc" - }, - "R": { - "tag": "forge:rods/zinc" - } + "F": "minecraft:feather", + "N": "#forge:nuggets/zinc", + "R": "#forge:rods/zinc" }, "pattern": [ "N", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_arrow_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_arrow_recycling.json index ff2ab3f69..b1cf08cdf 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_arrow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:zinc_arrow" - }, + "ingredient": "basemetals:zinc_arrow", "result": { "id": "basemetals:zinc_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_axe.json b/src/generated/resources/data/basemetals/recipe/zinc_axe.json index fe4b50493..bfff8caf1 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_axe.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_axe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_axe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/zinc" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_axe_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_axe_recycling.json index 91c721c5f..b47c96ab0 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_axe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_axe" - }, + "ingredient": "basemetals:zinc_axe", "result": { "count": 3, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bars.json b/src/generated/resources/data/basemetals/recipe/zinc_bars.json index 2031e9af9..4ac45925c 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bars.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bars.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_bars", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bars_2.json b/src/generated/resources/data/basemetals/recipe/zinc_bars_2.json index c8ef4b5d6..a90974d66 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bars_2.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bars_2.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_bars", "key": { - "X": { - "tag": "forge:rods/zinc" - } + "X": "#forge:rods/zinc" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bars_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_bars_recycling.json index 10d56a30c..24ad8abc1 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bars_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:zinc_bars" - }, + "ingredient": "basemetals:zinc_bars", "result": { "count": 3, "id": "basemetals:zinc_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_block.json b/src/generated/resources/data/basemetals/recipe/zinc_block.json index 120855838..ce15bb2cb 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_block.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_block.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_block", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json index d2dfd5ecf..810ea57b8 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_block_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:storage_blocks/zinc" - }, + "ingredient": "#forge:storage_blocks/zinc", "result": { "count": 9, "id": "basemetals:zinc_powder" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_block_ingot.json b/src/generated/resources/data/basemetals/recipe/zinc_block_ingot.json index be0583523..8561ddd06 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_block_ingot.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:zinc_ingot", "ingredients": [ - { - "tag": "forge:storage_blocks/zinc" - } + "#forge:storage_blocks/zinc" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bolt.json b/src/generated/resources/data/basemetals/recipe/zinc_bolt.json index fbfadb3b4..91e87c09c 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bolt.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bolt.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_bolt", "key": { - "F": { - "item": "minecraft:feather" - }, - "R": { - "tag": "forge:rods/zinc" - } + "F": "minecraft:feather", + "R": "#forge:rods/zinc" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bolt_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_bolt_recycling.json index 659c76f3d..089197263 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bolt_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:zinc_bolt" - }, + "ingredient": "basemetals:zinc_bolt", "result": { "count": 2, "id": "basemetals:zinc_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_boots.json b/src/generated/resources/data/basemetals/recipe/zinc_boots.json index e42f08aca..8642cfea2 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_boots.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_boots.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:zinc_boots", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_boots_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_boots_plate_repair.json index 02e7667c3..0548efd6f 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_boots_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_boots_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/zinc" - }, + "plate": "#forge:plates/zinc", "target": "basemetals:zinc_boots" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_boots_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_boots_recycling.json index 4dedb4444..cc896bdd4 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_boots_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_boots" - }, + "ingredient": "basemetals:zinc_boots", "result": { "count": 4, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bow.json b/src/generated/resources/data/basemetals/recipe/zinc_bow.json index 2298877f4..a20322c34 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bow.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bow.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_bow", "key": { - "R": { - "tag": "forge:rods/zinc" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/zinc", + "S": "minecraft:string" }, "pattern": [ " RS", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_bow_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_bow_recycling.json index db6ed9019..fc7e6c02d 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_bow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_bow" - }, + "ingredient": "basemetals:zinc_bow", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_button.json b/src/generated/resources/data/basemetals/recipe/zinc_button.json index dec26cf8e..0a9e5de6d 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_button.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_button.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_button", "key": { - "X": { - "tag": "forge:nuggets/zinc" - } + "X": "#forge:nuggets/zinc" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_button_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_button_recycling.json index 2c7e0f9db..4ed754046 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_button_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:zinc_button" - }, + "ingredient": "basemetals:zinc_button", "result": { "count": 2, "id": "basemetals:zinc_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_chestplate.json b/src/generated/resources/data/basemetals/recipe/zinc_chestplate.json index 74d7c97ad..bf8831095 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_chestplate.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_chestplate.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:zinc_chestplate", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "X X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_chestplate_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_chestplate_plate_repair.json index 9ab2fe776..5533a36b3 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_chestplate_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_chestplate_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/zinc" - }, + "plate": "#forge:plates/zinc", "target": "basemetals:zinc_chestplate" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_chestplate_recycling.json index bd7870520..7fcce19dd 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_chestplate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_chestplate" - }, + "ingredient": "basemetals:zinc_chestplate", "result": { "count": 8, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_crackhammer.json b/src/generated/resources/data/basemetals/recipe/zinc_crackhammer.json index c166e668d..9f9090ce8 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_crackhammer.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_crackhammer", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:storage_blocks/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:storage_blocks/zinc" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_crackhammer_recycling.json index 4d07895a5..6eef4d17e 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_crackhammer_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:zinc_crackhammer" - }, + "ingredient": "basemetals:zinc_crackhammer", "result": { "id": "basemetals:zinc_block" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_crossbow.json b/src/generated/resources/data/basemetals/recipe/zinc_crossbow.json index f3d0b71dc..efa749406 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_crossbow.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_crossbow.json @@ -5,15 +5,9 @@ "category": "equipment", "group": "basemetals:zinc_crossbow", "key": { - "G": { - "tag": "forge:gears/zinc" - }, - "R": { - "tag": "forge:rods/zinc" - }, - "S": { - "item": "minecraft:string" - } + "G": "#forge:gears/zinc", + "R": "#forge:rods/zinc", + "S": "minecraft:string" }, "pattern": [ "GRR", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_crossbow_recycling.json index d5a58f8d4..29929f8b5 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_crossbow_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_crossbow" - }, + "ingredient": "basemetals:zinc_crossbow", "result": { "count": 4, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_door.json b/src/generated/resources/data/basemetals/recipe/zinc_door.json index 5b20db48c..717d4c652 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_door.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_door.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_door", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_door_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_door_recycling.json index 2ef2f4da2..c92749e18 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_door_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_door" - }, + "ingredient": "basemetals:zinc_door", "result": { "count": 2, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_fishingrod.json b/src/generated/resources/data/basemetals/recipe/zinc_fishingrod.json index 0ff4cc8b1..404c63496 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_fishingrod.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_fishing_rod", "key": { - "R": { - "tag": "forge:rods/zinc" - }, - "S": { - "item": "minecraft:string" - } + "R": "#forge:rods/zinc", + "S": "minecraft:string" }, "pattern": [ " R", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_gear.json b/src/generated/resources/data/basemetals/recipe/zinc_gear.json index 404265368..35917c4d6 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_gear.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_gear.json @@ -5,12 +5,8 @@ "category": "misc", "group": "basemetals:zinc_gear", "key": { - "R": { - "tag": "forge:rods/zinc" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "R": "#forge:rods/zinc", + "X": "#forge:ingots/zinc" }, "pattern": [ " X ", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_gear_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_gear_recycling.json index c1a21b1d6..b86b3f7a5 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_gear_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_gear" - }, + "ingredient": "basemetals:zinc_gear", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_helmet.json b/src/generated/resources/data/basemetals/recipe/zinc_helmet.json index 214b33257..bd17cfc6c 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_helmet.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_helmet.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:zinc_helmet", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_helmet_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_helmet_plate_repair.json index 588366476..3c10507cf 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_helmet_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_helmet_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/zinc" - }, + "plate": "#forge:plates/zinc", "target": "basemetals:zinc_helmet" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_helmet_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_helmet_recycling.json index 996d432cd..b867f9d53 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_helmet_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_helmet" - }, + "ingredient": "basemetals:zinc_helmet", "result": { "count": 5, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_hoe.json b/src/generated/resources/data/basemetals/recipe/zinc_hoe.json index ec0197424..9b080b5fd 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_hoe.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_hoe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_hoe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/zinc" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_hoe_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_hoe_recycling.json index 74c40a745..c5758dc74 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_hoe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_hoe" - }, + "ingredient": "basemetals:zinc_hoe", "result": { "count": 2, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_horsearmor.json b/src/generated/resources/data/basemetals/recipe/zinc_horsearmor.json index 97cc87acd..c19ce09a2 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_horsearmor.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_horse_armor", "key": { - "W": { - "tag": "minecraft:wool" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "W": "#minecraft:wool", + "X": "#forge:ingots/zinc" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json index 4c5d4bdaa..a0ac6ac0c 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ingot_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ingots/zinc" - }, + "ingredient": "#forge:ingots/zinc", "result": { "id": "basemetals:zinc_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipe/zinc_ingot_from_nuggets.json index 72343d078..16d64c43b 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ingot_from_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:zinc_ingot", "key": { - "X": { - "tag": "forge:nuggets/zinc" - } + "X": "#forge:nuggets/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_leggings.json b/src/generated/resources/data/basemetals/recipe/zinc_leggings.json index 1d74afe38..e7fdbf22c 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_leggings.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_leggings.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:zinc_leggings", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_leggings_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_leggings_plate_repair.json index e1b2bba9e..b4a4026e6 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_leggings_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_leggings_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/zinc" - }, + "plate": "#forge:plates/zinc", "target": "basemetals:zinc_leggings" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_leggings_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_leggings_recycling.json index d4d5c3e04..66c3e4bfd 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_leggings_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_leggings" - }, + "ingredient": "basemetals:zinc_leggings", "result": { "count": 7, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_lever.json b/src/generated/resources/data/basemetals/recipe/zinc_lever.json index 8a6c3e355..bb5aeee04 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_lever.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_lever.json @@ -5,12 +5,8 @@ "category": "building", "group": "basemetals:zinc_lever", "key": { - "R": { - "tag": "forge:rods/zinc" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "R": "#forge:rods/zinc", + "X": "#forge:ingots/zinc" }, "pattern": [ "R", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_lever_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_lever_recycling.json index cbb63ee94..7f187cf74 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_lever_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_lever" - }, + "ingredient": "basemetals:zinc_lever", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json index 930e3174a..d93a3d093 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_nugget_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:nuggets/zinc" - }, + "ingredient": "#forge:nuggets/zinc", "result": { "id": "basemetals:zinc_smallpowder" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_nuggets.json b/src/generated/resources/data/basemetals/recipe/zinc_nuggets.json index 9629fc7b6..7f1782199 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_nuggets.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_nuggets.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:zinc_nugget", "ingredients": [ - { - "tag": "forge:ingots/zinc" - } + "#forge:ingots/zinc" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ore_blasting.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_blasting.json index 477c28221..d386aaf5a 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ore_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/zinc" - }, + "ingredient": "#forge:ores/zinc", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json index 9202e7337..c20e0c7f1 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ore_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:ores/zinc" - }, + "ingredient": "#forge:ores/zinc", "result": { "count": 2, "id": "basemetals:zinc_powder" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_ore_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_ore_smelting.json index 494507e40..c7c55eaf2 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_ore_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:ores/zinc" - }, + "ingredient": "#forge:ores/zinc", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_pickaxe.json b/src/generated/resources/data/basemetals/recipe/zinc_pickaxe.json index 3d900f2ee..f885aaca1 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_pickaxe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_pickaxe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_pickaxe_recycling.json index 05f5606ae..d61c9c752 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_pickaxe_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_pickaxe" - }, + "ingredient": "basemetals:zinc_pickaxe", "result": { "count": 3, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_plate.json b/src/generated/resources/data/basemetals/recipe/zinc_plate.json index 1b7e5eec2..e23edf003 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_plate.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_plate", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_plate_recycling.json index 3c458e4ad..c2b728baa 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_plate" - }, + "ingredient": "basemetals:zinc_plate", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/recipe/zinc_powder_from_small.json index 5f5594bd7..6ce171f5f 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_powder_from_small.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:zinc_powder", "key": { - "X": { - "tag": "forge:tiny_dusts/zinc" - } + "X": "#forge:tiny_dusts/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_powder_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_powder_smelting.json index 85cb6c3bb..eca2d4065 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_powder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:dusts/zinc" - }, + "ingredient": "#forge:dusts/zinc", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate.json index a8a56cdd4..b7c4982da 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_pressure_plate", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XX" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate_recycling.json index ca055ab88..97a5dc023 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_pressure_plate_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_pressure_plate" - }, + "ingredient": "basemetals:zinc_pressure_plate", "result": { "count": 2, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_raw_blasting.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_blasting.json index 0d59f5f64..ecbc4d4fd 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_raw_blasting.json @@ -2,9 +2,7 @@ "type": "minecraft:blasting", "cookingtime": 100, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/zinc" - }, + "ingredient": "#forge:raw_materials/zinc", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json index f1b1b8cfc..7b04df962 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_raw_crushing.json @@ -1,8 +1,6 @@ { "type": "basemetals:crushing", - "ingredient": { - "tag": "forge:raw_materials/zinc" - }, + "ingredient": "#forge:raw_materials/zinc", "result": { "id": "basemetals:zinc_powder" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_raw_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_raw_smelting.json index 1799ecc3d..403c15679 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_raw_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "tag": "forge:raw_materials/zinc" - }, + "ingredient": "#forge:raw_materials/zinc", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_rod.json b/src/generated/resources/data/basemetals/recipe/zinc_rod.json index f53f99d1a..b782bb02a 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_rod.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_rod.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:zinc_rod", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_rod_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_rod_recycling.json index 521da2d7a..57565b418 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_rod_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:zinc_rod" - }, + "ingredient": "basemetals:zinc_rod", "result": { "count": 4, "id": "basemetals:zinc_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_scythe.json b/src/generated/resources/data/basemetals/recipe/zinc_scythe.json index 30abb1b32..8bd4c8cbe 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_scythe.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_scythe.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_scythe", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/zinc" }, "pattern": [ "XX ", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_shears.json b/src/generated/resources/data/basemetals/recipe/zinc_shears.json index d79a52dd3..467d3d9da 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_shears.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_shears.json @@ -5,9 +5,7 @@ "category": "equipment", "group": "basemetals:zinc_shears", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ " X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_shears_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_shears_recycling.json index 22d4546b6..d7a9445f7 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_shears_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_shears" - }, + "ingredient": "basemetals:zinc_shears", "result": { "count": 2, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_shield.json b/src/generated/resources/data/basemetals/recipe/zinc_shield.json index 35349c2d8..7f6cb4ccb 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_shield.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_shield.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_shield", "key": { - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "W": "#minecraft:planks", + "X": "#forge:ingots/zinc" }, "pattern": [ "XWX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_shield_plate_repair.json b/src/generated/resources/data/basemetals/recipe/zinc_shield_plate_repair.json index dc67a35fe..a3cfbfdd9 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_shield_plate_repair.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_shield_plate_repair.json @@ -1,7 +1,5 @@ { "type": "basemetals:plate_repair", - "plate": { - "tag": "forge:plates/zinc" - }, + "plate": "#forge:plates/zinc", "target": "basemetals:zinc_shield" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipe/zinc_shovel.json b/src/generated/resources/data/basemetals/recipe/zinc_shovel.json index f24b33058..a579c2d0a 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_shovel.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_shovel.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_shovel", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/zinc" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_shovel_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_shovel_recycling.json index 444071d89..4739ead6f 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_shovel_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_shovel" - }, + "ingredient": "basemetals:zinc_shovel", "result": { "id": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_slab.json b/src/generated/resources/data/basemetals/recipe/zinc_slab.json index 507df2d4e..a4507940f 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_slab.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_slab.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_slab", "key": { - "X": { - "tag": "forge:storage_blocks/zinc" - } + "X": "#forge:storage_blocks/zinc" }, "pattern": [ "XXX" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_slab_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_slab_recycling.json index 729fa445f..b02ae462b 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_slab_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "item": "basemetals:zinc_slab" - }, + "ingredient": "basemetals:zinc_slab", "result": { "count": 4, "id": "basemetals:zinc_nugget" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_smallpowder.json b/src/generated/resources/data/basemetals/recipe/zinc_smallpowder.json index 36560d784..e14495e82 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_smallpowder.json @@ -5,9 +5,7 @@ "category": "misc", "group": "basemetals:zinc_smallpowder", "ingredients": [ - { - "tag": "forge:dusts/zinc" - } + "#forge:dusts/zinc" ], "result": { "count": 9, diff --git a/src/generated/resources/data/basemetals/recipe/zinc_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipe/zinc_smallpowder_smelting.json index 62f056a5d..735cf4e9c 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_smallpowder_smelting.json @@ -2,9 +2,7 @@ "type": "minecraft:smelting", "cookingtime": 200, "experience": 0.01, - "ingredient": { - "tag": "forge:tiny_dusts/zinc" - }, + "ingredient": "#forge:tiny_dusts/zinc", "result": { "id": "basemetals:zinc_nugget" } diff --git a/src/generated/resources/data/basemetals/recipe/zinc_stairs.json b/src/generated/resources/data/basemetals/recipe/zinc_stairs.json index 9430cfd2f..0f7cc08d3 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_stairs.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_stairs.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_stairs", "key": { - "X": { - "tag": "forge:storage_blocks/zinc" - } + "X": "#forge:storage_blocks/zinc" }, "pattern": [ "X ", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_sword.json b/src/generated/resources/data/basemetals/recipe/zinc_sword.json index 5d3297637..004c02655 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_sword.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_sword.json @@ -5,12 +5,8 @@ "category": "equipment", "group": "basemetals:zinc_sword", "key": { - "S": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:ingots/zinc" - } + "S": "#forge:rods/wooden", + "X": "#forge:ingots/zinc" }, "pattern": [ "X", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_sword_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_sword_recycling.json index 690fa3a41..1947e1437 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_sword_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_sword" - }, + "ingredient": "basemetals:zinc_sword", "result": { "count": 2, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_trapdoor.json b/src/generated/resources/data/basemetals/recipe/zinc_trapdoor.json index 548a7d947..312a6a7ac 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_trapdoor.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_trapdoor", "key": { - "X": { - "tag": "forge:ingots/zinc" - } + "X": "#forge:ingots/zinc" }, "pattern": [ "XX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_trapdoor_recycling.json index 0fb97055f..51ba195f9 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_trapdoor_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.1, - "ingredient": { - "item": "basemetals:zinc_trapdoor" - }, + "ingredient": "basemetals:zinc_trapdoor", "result": { "count": 4, "id": "basemetals:zinc_ingot" diff --git a/src/generated/resources/data/basemetals/recipe/zinc_wall.json b/src/generated/resources/data/basemetals/recipe/zinc_wall.json index 0978a3e23..7e95fc80b 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_wall.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_wall.json @@ -5,9 +5,7 @@ "category": "building", "group": "basemetals:zinc_wall", "key": { - "X": { - "tag": "forge:storage_blocks/zinc" - } + "X": "#forge:storage_blocks/zinc" }, "pattern": [ "XXX", diff --git a/src/generated/resources/data/basemetals/recipe/zinc_wall_recycling.json b/src/generated/resources/data/basemetals/recipe/zinc_wall_recycling.json index 52edb8210..d54c1e28d 100644 --- a/src/generated/resources/data/basemetals/recipe/zinc_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipe/zinc_wall_recycling.json @@ -2,9 +2,7 @@ "type": "basemetals:legacy_smelting", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "basemetals:zinc_wall" - }, + "ingredient": "basemetals:zinc_wall", "result": { "id": "basemetals:zinc_block" } diff --git a/src/generated/resources/data/basemetals/registry_manifest.json b/src/generated/resources/data/basemetals/registry_manifest.json index ec35623fe..73da84d33 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.21.1 catalogue" + "source": "Base Metals 1.21.11 catalogue" } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json b/src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json index fb6b1d80d..53a648e3e 100644 --- a/src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json +++ b/src/generated/resources/data/basemetals/tags/block/crackhammer_crushable.json @@ -1,81 +1,81 @@ { "replace": false, "values": [ + "#forge:cobblestone", + "#forge:gravel", "#forge:ores/adamantine", "#forge:ores/antimony", "#forge:ores/bismuth", + "#forge:ores/coal", "#forge:ores/coldiron", "#forge:ores/copper", + "#forge:ores/diamond", + "#forge:ores/emerald", + "#forge:ores/gold", + "#forge:ores/iron", + "#forge:ores/lapis", "#forge:ores/lead", "#forge:ores/mercury", + "#forge:ores/netherite_scrap", "#forge:ores/nickel", "#forge:ores/platinum", + "#forge:ores/quartz", + "#forge:ores/redstone", "#forge:ores/silver", "#forge:ores/starsteel", "#forge:ores/tin", "#forge:ores/zinc", + "#forge:stone", "#forge:storage_blocks/adamantine", "#forge:storage_blocks/antimony", "#forge:storage_blocks/aquarium", "#forge:storage_blocks/bismuth", "#forge:storage_blocks/brass", "#forge:storage_blocks/bronze", + "#forge:storage_blocks/charcoal", + "#forge:storage_blocks/coal", "#forge:storage_blocks/coldiron", "#forge:storage_blocks/copper", "#forge:storage_blocks/cupronickel", + "#forge:storage_blocks/diamond", "#forge:storage_blocks/electrum", + "#forge:storage_blocks/emerald", + "#forge:storage_blocks/gold", "#forge:storage_blocks/invar", + "#forge:storage_blocks/iron", + "#forge:storage_blocks/lapis", "#forge:storage_blocks/lead", "#forge:storage_blocks/mithril", "#forge:storage_blocks/nickel", "#forge:storage_blocks/pewter", "#forge:storage_blocks/platinum", + "#forge:storage_blocks/redstone", "#forge:storage_blocks/silver", "#forge:storage_blocks/starsteel", "#forge:storage_blocks/steel", "#forge:storage_blocks/tin", "#forge:storage_blocks/zinc", - "#forge:ores/coal", - "#forge:ores/diamond", - "#forge:ores/emerald", - "#forge:ores/gold", - "#forge:ores/iron", - "#forge:ores/lapis", - "#forge:ores/redstone", - "#forge:ores/quartz", - "#forge:ores/netherite_scrap", - "#forge:storage_blocks/coal", - "#forge:storage_blocks/charcoal", - "#forge:storage_blocks/diamond", - "#forge:storage_blocks/emerald", - "#forge:storage_blocks/gold", - "#forge:storage_blocks/iron", - "#forge:storage_blocks/lapis", - "#forge:storage_blocks/redstone", - "#forge:stone", - "#forge:cobblestone", - "#forge:gravel", - "minecraft:stone_bricks", - "minecraft:stone_slab", - "minecraft:stone_brick_slab", - "minecraft:mossy_cobblestone", + "minecraft:bone_block", "minecraft:cobblestone_wall", - "minecraft:mossy_cobblestone_wall", - "minecraft:sandstone", - "minecraft:sandstone_slab", + "minecraft:dark_prismarine", "minecraft:glass", - "minecraft:red_sandstone", - "minecraft:red_sandstone_slab", "minecraft:glowstone", + "minecraft:mossy_cobblestone", + "minecraft:mossy_cobblestone_wall", "minecraft:obsidian", - "minecraft:sugar_cane", - "minecraft:bone_block", - "minecraft:quartz_block", - "minecraft:quartz_slab", "minecraft:prismarine", "minecraft:prismarine_bricks", - "minecraft:dark_prismarine", + "minecraft:quartz_block", + "minecraft:quartz_slab", + "minecraft:red_sandstone", + "minecraft:red_sandstone_slab", + "minecraft:sandstone", + "minecraft:sandstone_slab", "minecraft:sea_lantern", - "minecraft:slime_block" + "minecraft:slime_block", + "minecraft:stone_brick_slab", + "minecraft:stone_bricks", + "minecraft:stone_slab", + "minecraft:sugar_cane" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/block/bars/copper.json b/src/generated/resources/data/forge/tags/block/bars/copper.json new file mode 100644 index 000000000..b5a995f14 --- /dev/null +++ b/src/generated/resources/data/forge/tags/block/bars/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_bars", + "minecraft:copper_bars" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_invar.json b/src/generated/resources/data/forge/tags/fluid/molten_invar.json index e78c40a3a..1bf9a13e7 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_invar.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_invar.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:invar", - "basemetals:flowing_invar" + "basemetals:flowing_invar", + "basemetals:invar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_lead.json b/src/generated/resources/data/forge/tags/fluid/molten_lead.json index 702ccd162..13eb7f05c 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_lead.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_lead.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:lead", - "basemetals:flowing_lead" + "basemetals:flowing_lead", + "basemetals:lead" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_mercury.json b/src/generated/resources/data/forge/tags/fluid/molten_mercury.json index be6f4aa85..ffd1cb3d3 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_mercury.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_mercury.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:mercury", - "basemetals:flowing_mercury" + "basemetals:flowing_mercury", + "basemetals:mercury" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_mithril.json b/src/generated/resources/data/forge/tags/fluid/molten_mithril.json index 1e4c5ee2a..94d582923 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_mithril.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_mithril.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:mithril", - "basemetals:flowing_mithril" + "basemetals:flowing_mithril", + "basemetals:mithril" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_nickel.json b/src/generated/resources/data/forge/tags/fluid/molten_nickel.json index aad540974..abfb550d2 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_nickel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_nickel.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:nickel", - "basemetals:flowing_nickel" + "basemetals:flowing_nickel", + "basemetals:nickel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_pewter.json b/src/generated/resources/data/forge/tags/fluid/molten_pewter.json index 73ca23e03..e153f8415 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_pewter.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_pewter.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:pewter", - "basemetals:flowing_pewter" + "basemetals:flowing_pewter", + "basemetals:pewter" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_platinum.json b/src/generated/resources/data/forge/tags/fluid/molten_platinum.json index bac3c7768..5fa6aee13 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_platinum.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_platinum.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:platinum", - "basemetals:flowing_platinum" + "basemetals:flowing_platinum", + "basemetals:platinum" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_silver.json b/src/generated/resources/data/forge/tags/fluid/molten_silver.json index 2346f9b7b..c8e05b678 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_silver.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_silver.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:silver", - "basemetals:flowing_silver" + "basemetals:flowing_silver", + "basemetals:silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json b/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json index a65fd65ab..8d55d7410 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_starsteel.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:starsteel", - "basemetals:flowing_starsteel" + "basemetals:flowing_starsteel", + "basemetals:starsteel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_steel.json b/src/generated/resources/data/forge/tags/fluid/molten_steel.json index ab3588ebe..ea628b1a1 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_steel.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_steel.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:steel", - "basemetals:flowing_steel" + "basemetals:flowing_steel", + "basemetals:steel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_tin.json b/src/generated/resources/data/forge/tags/fluid/molten_tin.json index 61cb27f72..fb80921a9 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_tin.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_tin.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:tin", - "basemetals:flowing_tin" + "basemetals:flowing_tin", + "basemetals:tin" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluid/molten_zinc.json b/src/generated/resources/data/forge/tags/fluid/molten_zinc.json index 67371b1fe..78efdeae7 100644 --- a/src/generated/resources/data/forge/tags/fluid/molten_zinc.json +++ b/src/generated/resources/data/forge/tags/fluid/molten_zinc.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "basemetals:zinc", - "basemetals:flowing_zinc" + "basemetals:flowing_zinc", + "basemetals:zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/boots/copper.json b/src/generated/resources/data/forge/tags/item/armors/boots/copper.json new file mode 100644 index 000000000..727a028f1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/armors/boots/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_boots", + "minecraft:copper_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json b/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json new file mode 100644 index 000000000..dceb963c6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/armors/chestplates/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_chestplate", + "minecraft:copper_chestplate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json b/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json new file mode 100644 index 000000000..ebc5e4b73 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/armors/helmets/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_helmet", + "minecraft:copper_helmet" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/horse/copper.json b/src/generated/resources/data/forge/tags/item/armors/horse/copper.json new file mode 100644 index 000000000..8a80963dd --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/armors/horse/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_horse_armor", + "minecraft:copper_horse_armor" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json b/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json new file mode 100644 index 000000000..463d0d7c4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/armors/leggings/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_leggings", + "minecraft:copper_leggings" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/bars/copper.json b/src/generated/resources/data/forge/tags/item/bars/copper.json new file mode 100644 index 000000000..b5a995f14 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/bars/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_bars", + "minecraft:copper_bars" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/gears.json b/src/generated/resources/data/forge/tags/item/gears.json index cc590eaec..5e1505e00 100644 --- a/src/generated/resources/data/forge/tags/item/gears.json +++ b/src/generated/resources/data/forge/tags/item/gears.json @@ -10,25 +10,25 @@ "#forge:gears/coldiron", "#forge:gears/copper", "#forge:gears/cupronickel", + "#forge:gears/diamond", "#forge:gears/electrum", + "#forge:gears/emerald", + "#forge:gears/gold", "#forge:gears/invar", + "#forge:gears/iron", "#forge:gears/lead", "#forge:gears/mithril", "#forge:gears/nickel", + "#forge:gears/obsidian", "#forge:gears/pewter", "#forge:gears/platinum", + "#forge:gears/quartz", "#forge:gears/silver", "#forge:gears/starsteel", "#forge:gears/steel", - "#forge:gears/tin", - "#forge:gears/zinc", - "#forge:gears/diamond", - "#forge:gears/emerald", - "#forge:gears/gold", - "#forge:gears/iron", - "#forge:gears/obsidian", - "#forge:gears/quartz", "#forge:gears/stone", - "#forge:gears/wood" + "#forge:gears/tin", + "#forge:gears/wood", + "#forge:gears/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/nuggets/copper.json b/src/generated/resources/data/forge/tags/item/nuggets/copper.json index 90c6ef23b..b67eb8a32 100644 --- a/src/generated/resources/data/forge/tags/item/nuggets/copper.json +++ b/src/generated/resources/data/forge/tags/item/nuggets/copper.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "basemetals:copper_nugget" + "basemetals:copper_nugget", + "minecraft:copper_nugget" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/plates.json b/src/generated/resources/data/forge/tags/item/plates.json index f66fd865e..cf04bcbd2 100644 --- a/src/generated/resources/data/forge/tags/item/plates.json +++ b/src/generated/resources/data/forge/tags/item/plates.json @@ -10,8 +10,12 @@ "#forge:plates/coldiron", "#forge:plates/copper", "#forge:plates/cupronickel", + "#forge:plates/diamond", "#forge:plates/electrum", + "#forge:plates/emerald", + "#forge:plates/gold", "#forge:plates/invar", + "#forge:plates/iron", "#forge:plates/lead", "#forge:plates/mithril", "#forge:plates/nickel", @@ -21,10 +25,6 @@ "#forge:plates/starsteel", "#forge:plates/steel", "#forge:plates/tin", - "#forge:plates/zinc", - "#forge:plates/diamond", - "#forge:plates/emerald", - "#forge:plates/gold", - "#forge:plates/iron" + "#forge:plates/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/raw_materials.json b/src/generated/resources/data/forge/tags/item/raw_materials.json index a096f40e5..77e41677c 100644 --- a/src/generated/resources/data/forge/tags/item/raw_materials.json +++ b/src/generated/resources/data/forge/tags/item/raw_materials.json @@ -1,13 +1,13 @@ { "replace": false, "values": [ - "#forge:raw_materials/iron", - "#forge:raw_materials/gold", - "#forge:raw_materials/copper", "#forge:raw_materials/adamantine", "#forge:raw_materials/antimony", "#forge:raw_materials/bismuth", "#forge:raw_materials/coldiron", + "#forge:raw_materials/copper", + "#forge:raw_materials/gold", + "#forge:raw_materials/iron", "#forge:raw_materials/lead", "#forge:raw_materials/mercury", "#forge:raw_materials/nickel", diff --git a/src/generated/resources/data/forge/tags/item/rods.json b/src/generated/resources/data/forge/tags/item/rods.json index 642b1359b..51dd4c4cf 100644 --- a/src/generated/resources/data/forge/tags/item/rods.json +++ b/src/generated/resources/data/forge/tags/item/rods.json @@ -10,23 +10,23 @@ "#forge:rods/coldiron", "#forge:rods/copper", "#forge:rods/cupronickel", + "#forge:rods/diamond", "#forge:rods/electrum", + "#forge:rods/emerald", + "#forge:rods/gold", "#forge:rods/invar", + "#forge:rods/iron", "#forge:rods/lead", "#forge:rods/mithril", "#forge:rods/nickel", + "#forge:rods/obsidian", "#forge:rods/pewter", "#forge:rods/platinum", + "#forge:rods/quartz", "#forge:rods/silver", "#forge:rods/starsteel", "#forge:rods/steel", "#forge:rods/tin", - "#forge:rods/zinc", - "#forge:rods/diamond", - "#forge:rods/emerald", - "#forge:rods/gold", - "#forge:rods/iron", - "#forge:rods/obsidian", - "#forge:rods/quartz" + "#forge:rods/zinc" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/axes/copper.json b/src/generated/resources/data/forge/tags/item/tools/axes/copper.json new file mode 100644 index 000000000..1cfda9ea7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/tools/axes/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_axe", + "minecraft:copper_axe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json b/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json new file mode 100644 index 000000000..8ff1d2ec7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/tools/hoes/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_hoe", + "minecraft:copper_hoe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json b/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json new file mode 100644 index 000000000..3edbba3ae --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/tools/pickaxes/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_pickaxe", + "minecraft:copper_pickaxe" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json b/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json new file mode 100644 index 000000000..e375f6e5e --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/tools/shovels/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_shovel", + "minecraft:copper_shovel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/item/tools/swords/copper.json b/src/generated/resources/data/forge/tags/item/tools/swords/copper.json new file mode 100644 index 000000000..ffb0412c0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/item/tools/swords/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "basemetals:copper_sword", + "minecraft:copper_sword" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json index fe193139f..0fd18b8d2 100644 --- a/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json +++ b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json @@ -7,6 +7,7 @@ "basemetals:bismuth_block", "basemetals:brass_block", "basemetals:bronze_block", + "basemetals:charcoal_block", "basemetals:coldiron_block", "basemetals:copper_block", "basemetals:cupronickel_block", @@ -21,7 +22,6 @@ "basemetals:starsteel_block", "basemetals:steel_block", "basemetals:tin_block", - "basemetals:zinc_block", - "basemetals:charcoal_block" + "basemetals:zinc_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index d218b60ee..f1d7ef653 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,329 +1,329 @@ { "replace": false, "values": [ - "basemetals:adamantine_block", - "basemetals:adamantine_plate", + "basemetals:adamantine_anvil", "basemetals:adamantine_bars", - "basemetals:adamantine_door", - "basemetals:adamantine_trapdoor", + "basemetals:adamantine_block", "basemetals:adamantine_button", - "basemetals:adamantine_slab", + "basemetals:adamantine_door", "basemetals:adamantine_lever", + "basemetals:adamantine_ore", + "basemetals:adamantine_plate", "basemetals:adamantine_pressure_plate", + "basemetals:adamantine_slab", "basemetals:adamantine_stairs", + "basemetals:adamantine_trapdoor", "basemetals:adamantine_wall", - "basemetals:double_adamantine_slab", - "basemetals:adamantine_ore", - "basemetals:antimony_block", - "basemetals:antimony_plate", "basemetals:antimony_bars", - "basemetals:antimony_door", - "basemetals:antimony_trapdoor", + "basemetals:antimony_block", "basemetals:antimony_button", - "basemetals:antimony_slab", + "basemetals:antimony_door", "basemetals:antimony_lever", + "basemetals:antimony_ore", + "basemetals:antimony_plate", "basemetals:antimony_pressure_plate", + "basemetals:antimony_slab", "basemetals:antimony_stairs", + "basemetals:antimony_trapdoor", "basemetals:antimony_wall", - "basemetals:double_antimony_slab", - "basemetals:antimony_ore", - "basemetals:aquarium_block", - "basemetals:aquarium_plate", "basemetals:aquarium_bars", - "basemetals:aquarium_door", - "basemetals:aquarium_trapdoor", + "basemetals:aquarium_block", "basemetals:aquarium_button", - "basemetals:aquarium_slab", + "basemetals:aquarium_door", "basemetals:aquarium_lever", + "basemetals:aquarium_plate", "basemetals:aquarium_pressure_plate", + "basemetals:aquarium_slab", "basemetals:aquarium_stairs", + "basemetals:aquarium_trapdoor", "basemetals:aquarium_wall", - "basemetals:double_aquarium_slab", - "basemetals:bismuth_block", - "basemetals:bismuth_plate", "basemetals:bismuth_bars", - "basemetals:bismuth_door", - "basemetals:bismuth_trapdoor", + "basemetals:bismuth_block", "basemetals:bismuth_button", - "basemetals:bismuth_slab", + "basemetals:bismuth_door", "basemetals:bismuth_lever", + "basemetals:bismuth_ore", + "basemetals:bismuth_plate", "basemetals:bismuth_pressure_plate", + "basemetals:bismuth_slab", "basemetals:bismuth_stairs", + "basemetals:bismuth_trapdoor", "basemetals:bismuth_wall", - "basemetals:double_bismuth_slab", - "basemetals:bismuth_ore", - "basemetals:brass_block", - "basemetals:brass_plate", "basemetals:brass_bars", - "basemetals:brass_door", - "basemetals:brass_trapdoor", + "basemetals:brass_block", "basemetals:brass_button", - "basemetals:brass_slab", + "basemetals:brass_door", "basemetals:brass_lever", + "basemetals:brass_plate", "basemetals:brass_pressure_plate", + "basemetals:brass_slab", "basemetals:brass_stairs", + "basemetals:brass_trapdoor", "basemetals:brass_wall", - "basemetals:double_brass_slab", - "basemetals:bronze_block", - "basemetals:bronze_plate", "basemetals:bronze_bars", - "basemetals:bronze_door", - "basemetals:bronze_trapdoor", + "basemetals:bronze_block", "basemetals:bronze_button", - "basemetals:bronze_slab", + "basemetals:bronze_door", "basemetals:bronze_lever", + "basemetals:bronze_plate", "basemetals:bronze_pressure_plate", + "basemetals:bronze_slab", "basemetals:bronze_stairs", + "basemetals:bronze_trapdoor", "basemetals:bronze_wall", - "basemetals:double_bronze_slab", - "basemetals:coldiron_block", - "basemetals:coldiron_plate", + "basemetals:charcoal_block", "basemetals:coldiron_bars", - "basemetals:coldiron_door", - "basemetals:coldiron_trapdoor", + "basemetals:coldiron_block", "basemetals:coldiron_button", - "basemetals:coldiron_slab", + "basemetals:coldiron_door", "basemetals:coldiron_lever", + "basemetals:coldiron_ore", + "basemetals:coldiron_plate", "basemetals:coldiron_pressure_plate", + "basemetals:coldiron_slab", "basemetals:coldiron_stairs", + "basemetals:coldiron_trapdoor", "basemetals:coldiron_wall", - "basemetals:double_coldiron_slab", - "basemetals:coldiron_ore", - "basemetals:copper_block", - "basemetals:copper_plate", "basemetals:copper_bars", - "basemetals:copper_door", - "basemetals:copper_trapdoor", + "basemetals:copper_block", "basemetals:copper_button", - "basemetals:copper_slab", + "basemetals:copper_door", "basemetals:copper_lever", + "basemetals:copper_ore", + "basemetals:copper_plate", "basemetals:copper_pressure_plate", + "basemetals:copper_slab", "basemetals:copper_stairs", + "basemetals:copper_trapdoor", "basemetals:copper_wall", - "basemetals:double_copper_slab", - "basemetals:copper_ore", - "basemetals:cupronickel_block", - "basemetals:cupronickel_plate", "basemetals:cupronickel_bars", - "basemetals:cupronickel_door", - "basemetals:cupronickel_trapdoor", + "basemetals:cupronickel_block", "basemetals:cupronickel_button", - "basemetals:cupronickel_slab", + "basemetals:cupronickel_door", "basemetals:cupronickel_lever", + "basemetals:cupronickel_plate", "basemetals:cupronickel_pressure_plate", + "basemetals:cupronickel_slab", "basemetals:cupronickel_stairs", + "basemetals:cupronickel_trapdoor", "basemetals:cupronickel_wall", + "basemetals:diamond_bars", + "basemetals:diamond_button", + "basemetals:diamond_door", + "basemetals:diamond_lever", + "basemetals:diamond_pressure_plate", + "basemetals:diamond_slab", + "basemetals:diamond_stairs", + "basemetals:diamond_trapdoor", + "basemetals:diamond_wall", + "basemetals:double_adamantine_slab", + "basemetals:double_antimony_slab", + "basemetals:double_aquarium_slab", + "basemetals:double_bismuth_slab", + "basemetals:double_brass_slab", + "basemetals:double_bronze_slab", + "basemetals:double_coldiron_slab", + "basemetals:double_copper_slab", "basemetals:double_cupronickel_slab", - "basemetals:electrum_block", - "basemetals:electrum_plate", + "basemetals:double_diamond_slab", + "basemetals:double_electrum_slab", + "basemetals:double_emerald_slab", + "basemetals:double_gold_slab", + "basemetals:double_invar_slab", + "basemetals:double_iron_slab", + "basemetals:double_lead_slab", + "basemetals:double_mithril_slab", + "basemetals:double_nickel_slab", + "basemetals:double_obsidian_slab", + "basemetals:double_pewter_slab", + "basemetals:double_platinum_slab", + "basemetals:double_silver_slab", + "basemetals:double_starsteel_slab", + "basemetals:double_steel_slab", + "basemetals:double_tin_slab", + "basemetals:double_zinc_slab", "basemetals:electrum_bars", - "basemetals:electrum_door", - "basemetals:electrum_trapdoor", + "basemetals:electrum_block", "basemetals:electrum_button", - "basemetals:electrum_slab", + "basemetals:electrum_door", "basemetals:electrum_lever", + "basemetals:electrum_plate", "basemetals:electrum_pressure_plate", + "basemetals:electrum_slab", "basemetals:electrum_stairs", + "basemetals:electrum_trapdoor", "basemetals:electrum_wall", - "basemetals:double_electrum_slab", - "basemetals:invar_block", - "basemetals:invar_plate", + "basemetals:emerald_bars", + "basemetals:emerald_button", + "basemetals:emerald_door", + "basemetals:emerald_lever", + "basemetals:emerald_pressure_plate", + "basemetals:emerald_slab", + "basemetals:emerald_stairs", + "basemetals:emerald_trapdoor", + "basemetals:emerald_wall", + "basemetals:gold_bars", + "basemetals:gold_button", + "basemetals:gold_door", + "basemetals:gold_lever", + "basemetals:gold_plate", + "basemetals:gold_slab", + "basemetals:gold_stairs", + "basemetals:gold_trapdoor", + "basemetals:gold_wall", + "basemetals:human_detector", "basemetals:invar_bars", - "basemetals:invar_door", - "basemetals:invar_trapdoor", + "basemetals:invar_block", "basemetals:invar_button", - "basemetals:invar_slab", + "basemetals:invar_door", "basemetals:invar_lever", + "basemetals:invar_plate", "basemetals:invar_pressure_plate", + "basemetals:invar_slab", "basemetals:invar_stairs", + "basemetals:invar_trapdoor", "basemetals:invar_wall", - "basemetals:double_invar_slab", - "basemetals:lead_block", - "basemetals:lead_plate", + "basemetals:iron_button", + "basemetals:iron_lever", + "basemetals:iron_plate", + "basemetals:iron_slab", + "basemetals:iron_stairs", + "basemetals:iron_wall", "basemetals:lead_bars", - "basemetals:lead_door", - "basemetals:lead_trapdoor", + "basemetals:lead_block", "basemetals:lead_button", - "basemetals:lead_slab", + "basemetals:lead_door", "basemetals:lead_lever", + "basemetals:lead_ore", + "basemetals:lead_plate", "basemetals:lead_pressure_plate", + "basemetals:lead_slab", "basemetals:lead_stairs", + "basemetals:lead_trapdoor", "basemetals:lead_wall", - "basemetals:double_lead_slab", - "basemetals:lead_ore", "basemetals:mercury_ore", - "basemetals:mithril_block", - "basemetals:mithril_plate", "basemetals:mithril_bars", - "basemetals:mithril_door", - "basemetals:mithril_trapdoor", + "basemetals:mithril_block", "basemetals:mithril_button", - "basemetals:mithril_slab", + "basemetals:mithril_door", "basemetals:mithril_lever", + "basemetals:mithril_plate", "basemetals:mithril_pressure_plate", + "basemetals:mithril_slab", "basemetals:mithril_stairs", + "basemetals:mithril_trapdoor", "basemetals:mithril_wall", - "basemetals:double_mithril_slab", - "basemetals:nickel_block", - "basemetals:nickel_plate", "basemetals:nickel_bars", - "basemetals:nickel_door", - "basemetals:nickel_trapdoor", + "basemetals:nickel_block", "basemetals:nickel_button", - "basemetals:nickel_slab", + "basemetals:nickel_door", "basemetals:nickel_lever", + "basemetals:nickel_ore", + "basemetals:nickel_plate", "basemetals:nickel_pressure_plate", + "basemetals:nickel_slab", "basemetals:nickel_stairs", + "basemetals:nickel_trapdoor", "basemetals:nickel_wall", - "basemetals:double_nickel_slab", - "basemetals:nickel_ore", - "basemetals:pewter_block", - "basemetals:pewter_plate", + "basemetals:obsidian_bars", + "basemetals:obsidian_button", + "basemetals:obsidian_door", + "basemetals:obsidian_lever", + "basemetals:obsidian_pressure_plate", + "basemetals:obsidian_slab", + "basemetals:obsidian_stairs", + "basemetals:obsidian_trapdoor", + "basemetals:obsidian_wall", "basemetals:pewter_bars", - "basemetals:pewter_door", - "basemetals:pewter_trapdoor", + "basemetals:pewter_block", "basemetals:pewter_button", - "basemetals:pewter_slab", + "basemetals:pewter_door", "basemetals:pewter_lever", + "basemetals:pewter_plate", "basemetals:pewter_pressure_plate", + "basemetals:pewter_slab", "basemetals:pewter_stairs", + "basemetals:pewter_trapdoor", "basemetals:pewter_wall", - "basemetals:double_pewter_slab", - "basemetals:platinum_block", - "basemetals:platinum_plate", "basemetals:platinum_bars", - "basemetals:platinum_door", - "basemetals:platinum_trapdoor", + "basemetals:platinum_block", "basemetals:platinum_button", - "basemetals:platinum_slab", + "basemetals:platinum_door", "basemetals:platinum_lever", + "basemetals:platinum_ore", + "basemetals:platinum_plate", "basemetals:platinum_pressure_plate", + "basemetals:platinum_slab", "basemetals:platinum_stairs", + "basemetals:platinum_trapdoor", "basemetals:platinum_wall", - "basemetals:double_platinum_slab", - "basemetals:platinum_ore", - "basemetals:silver_block", - "basemetals:silver_plate", + "basemetals:quartz_bars", + "basemetals:quartz_button", + "basemetals:quartz_door", + "basemetals:quartz_lever", + "basemetals:quartz_pressure_plate", + "basemetals:quartz_trapdoor", + "basemetals:quartz_wall", "basemetals:silver_bars", - "basemetals:silver_door", - "basemetals:silver_trapdoor", + "basemetals:silver_block", "basemetals:silver_button", - "basemetals:silver_slab", + "basemetals:silver_door", "basemetals:silver_lever", + "basemetals:silver_ore", + "basemetals:silver_plate", "basemetals:silver_pressure_plate", + "basemetals:silver_slab", "basemetals:silver_stairs", + "basemetals:silver_trapdoor", "basemetals:silver_wall", - "basemetals:double_silver_slab", - "basemetals:silver_ore", - "basemetals:starsteel_block", - "basemetals:starsteel_plate", "basemetals:starsteel_bars", - "basemetals:starsteel_door", - "basemetals:starsteel_trapdoor", + "basemetals:starsteel_block", "basemetals:starsteel_button", - "basemetals:starsteel_slab", + "basemetals:starsteel_door", "basemetals:starsteel_lever", + "basemetals:starsteel_ore", + "basemetals:starsteel_plate", "basemetals:starsteel_pressure_plate", + "basemetals:starsteel_slab", "basemetals:starsteel_stairs", + "basemetals:starsteel_trapdoor", "basemetals:starsteel_wall", - "basemetals:double_starsteel_slab", - "basemetals:starsteel_ore", - "basemetals:steel_block", - "basemetals:steel_plate", + "basemetals:steel_anvil", "basemetals:steel_bars", - "basemetals:steel_door", - "basemetals:steel_trapdoor", + "basemetals:steel_block", "basemetals:steel_button", - "basemetals:steel_slab", + "basemetals:steel_door", "basemetals:steel_lever", + "basemetals:steel_plate", "basemetals:steel_pressure_plate", + "basemetals:steel_slab", "basemetals:steel_stairs", + "basemetals:steel_trapdoor", "basemetals:steel_wall", - "basemetals:double_steel_slab", - "basemetals:tin_block", - "basemetals:tin_plate", + "basemetals:stone_anvil", "basemetals:tin_bars", - "basemetals:tin_door", - "basemetals:tin_trapdoor", + "basemetals:tin_block", "basemetals:tin_button", - "basemetals:tin_slab", + "basemetals:tin_door", "basemetals:tin_lever", + "basemetals:tin_ore", + "basemetals:tin_plate", "basemetals:tin_pressure_plate", + "basemetals:tin_slab", "basemetals:tin_stairs", + "basemetals:tin_trapdoor", "basemetals:tin_wall", - "basemetals:double_tin_slab", - "basemetals:tin_ore", - "basemetals:zinc_block", - "basemetals:zinc_plate", "basemetals:zinc_bars", - "basemetals:zinc_door", - "basemetals:zinc_trapdoor", + "basemetals:zinc_block", "basemetals:zinc_button", - "basemetals:zinc_slab", + "basemetals:zinc_door", "basemetals:zinc_lever", + "basemetals:zinc_ore", + "basemetals:zinc_plate", "basemetals:zinc_pressure_plate", + "basemetals:zinc_slab", "basemetals:zinc_stairs", - "basemetals:zinc_wall", - "basemetals:double_zinc_slab", - "basemetals:zinc_ore", - "basemetals:stone_anvil", - "basemetals:steel_anvil", - "basemetals:adamantine_anvil", - "basemetals:human_detector", - "basemetals:charcoal_block", - "basemetals:diamond_bars", - "basemetals:diamond_door", - "basemetals:diamond_trapdoor", - "basemetals:diamond_button", - "basemetals:diamond_slab", - "basemetals:diamond_lever", - "basemetals:diamond_pressure_plate", - "basemetals:diamond_stairs", - "basemetals:diamond_wall", - "basemetals:double_diamond_slab", - "basemetals:emerald_bars", - "basemetals:emerald_door", - "basemetals:emerald_trapdoor", - "basemetals:emerald_button", - "basemetals:emerald_slab", - "basemetals:emerald_lever", - "basemetals:emerald_pressure_plate", - "basemetals:emerald_stairs", - "basemetals:emerald_wall", - "basemetals:double_emerald_slab", - "basemetals:gold_bars", - "basemetals:gold_door", - "basemetals:gold_trapdoor", - "basemetals:gold_button", - "basemetals:gold_slab", - "basemetals:gold_lever", - "basemetals:gold_stairs", - "basemetals:gold_wall", - "basemetals:double_gold_slab", - "basemetals:obsidian_bars", - "basemetals:obsidian_door", - "basemetals:obsidian_trapdoor", - "basemetals:obsidian_button", - "basemetals:obsidian_slab", - "basemetals:obsidian_lever", - "basemetals:obsidian_pressure_plate", - "basemetals:obsidian_stairs", - "basemetals:obsidian_wall", - "basemetals:double_obsidian_slab", - "basemetals:iron_button", - "basemetals:iron_slab", - "basemetals:iron_lever", - "basemetals:iron_stairs", - "basemetals:iron_wall", - "basemetals:double_iron_slab", - "basemetals:quartz_bars", - "basemetals:quartz_door", - "basemetals:quartz_trapdoor", - "basemetals:quartz_button", - "basemetals:quartz_lever", - "basemetals:quartz_pressure_plate", - "basemetals:quartz_wall", - "basemetals:gold_plate", - "basemetals:iron_plate" + "basemetals:zinc_trapdoor", + "basemetals:zinc_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/arrows.json b/src/generated/resources/data/minecraft/tags/item/arrows.json index a03af4ad9..689df2aa4 100644 --- a/src/generated/resources/data/minecraft/tags/item/arrows.json +++ b/src/generated/resources/data/minecraft/tags/item/arrows.json @@ -10,23 +10,23 @@ "basemetals:coldiron_arrow", "basemetals:copper_arrow", "basemetals:cupronickel_arrow", + "basemetals:diamond_arrow", "basemetals:electrum_arrow", + "basemetals:emerald_arrow", + "basemetals:gold_arrow", "basemetals:invar_arrow", + "basemetals:iron_arrow", "basemetals:lead_arrow", "basemetals:mithril_arrow", "basemetals:nickel_arrow", + "basemetals:obsidian_arrow", "basemetals:pewter_arrow", "basemetals:platinum_arrow", + "basemetals:quartz_arrow", "basemetals:silver_arrow", "basemetals:starsteel_arrow", "basemetals:steel_arrow", "basemetals:tin_arrow", - "basemetals:zinc_arrow", - "basemetals:diamond_arrow", - "basemetals:emerald_arrow", - "basemetals:gold_arrow", - "basemetals:iron_arrow", - "basemetals:obsidian_arrow", - "basemetals:quartz_arrow" + "basemetals:zinc_arrow" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/copper_tool_materials.json b/src/generated/resources/data/minecraft/tags/item/copper_tool_materials.json new file mode 100644 index 000000000..00ade352b --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/copper_tool_materials.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#forge:ingots/copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/repairs_copper_armor.json b/src/generated/resources/data/minecraft/tags/item/repairs_copper_armor.json new file mode 100644 index 000000000..00ade352b --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/repairs_copper_armor.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#forge:ingots/copper" + ] +} \ No newline at end of file diff --git a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java index 99aa2b1ea..46d03dc01 100644 --- a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java +++ b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/ConfigScreenSmoke.java @@ -41,11 +41,11 @@ private static void verifyOnce(Minecraft minecraft, Screen parent) { minecraft.setScreen(screen); require(buttons(screen).size() == 9, "Expected the mode, four switches and four action buttons"); String initialLabel = buttons(screen).get(0).getMessage().getString(); - buttons(screen).get(0).onPress(); + buttons(screen).get(0).onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); require(!initialLabel.equals(buttons(screen).get(0).getMessage().getString()), "Mode did not change"); - button(screen, "config.basemetals.undo").onPress(); + button(screen, "config.basemetals.undo").onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); require(initialLabel.equals(buttons(screen).get(0).getMessage().getString()), "Undo lost the initial mode"); - button(screen, "config.basemetals.defaults").onPress(); + button(screen, "config.basemetals.defaults").onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); require(buttons(screen).get(0).getMessage().getString().contains(I18n.get(ContentMode.HIGH_FANTASY.translationKey())), "Defaults must select High Fantasy"); screen.onClose(); @@ -54,17 +54,17 @@ private static void verifyOnce(Minecraft minecraft, Screen parent) { screen = extensions.get(0).createScreen(parent); minecraft.setScreen(screen); - buttons(screen).get(1).onPress(); - button(screen, "gui.done").onPress(); + buttons(screen).get(1).onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); + button(screen, "gui.done").onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); require(minecraft.screen == parent, "Done did not return to the parent screen"); require(BaseMetalsConfig.SPECIAL_EFFECTS.get() != originalEffects, "Done did not save a boolean edit"); screen = extensions.get(0).createScreen(parent); minecraft.setScreen(screen); - buttons(screen).get(0).onPress(); - button(screen, "gui.done").onPress(); + buttons(screen).get(0).onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); + button(screen, "gui.done").onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); require(minecraft.screen instanceof ConfirmScreen, "A mode change needs restart confirmation"); - button(minecraft.screen, "gui.yes").onPress(); + button(minecraft.screen, "gui.yes").onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); require(minecraft.screen == parent, "Confirmation did not return to the parent screen"); require(!originalMode.equals(BaseMetalsConfig.CONTENT_MODE.get()), "Done did not save the mode edit"); require(BaseMetalsConfig.activeMode() == activeMode, "A GUI edit changed the running content mode"); 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 e6439e4b4..bd057bc1a 100644 --- a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java +++ b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java @@ -10,7 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.chunk.ChunkSectionLayer; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.server.level.ServerLevel; @@ -18,7 +18,7 @@ import net.minecraft.world.entity.projectile.ItemSupplier; import net.minecraft.world.Difficulty; import net.minecraft.world.level.DataPackConfig; -import net.minecraft.world.level.GameRules; +import net.minecraft.world.level.gamerules.GameRules; import net.minecraft.world.level.GameType; import net.minecraft.world.level.LevelSettings; import net.minecraft.world.level.block.Block; @@ -30,14 +30,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; /** * Development-only proof that the real client can create, join, tick, and * cleanly stop an integrated server with Base Metals and OreSpawn. */ -@Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, value = Dist.CLIENT) +@Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, value = Dist.CLIENT, + bus = Mod.EventBusSubscriber.Bus.MOD) public final class IntegratedWorldSmoke { private static final String ENABLED_PROPERTY = "basemetals.integratedWorldSmoke"; private static final String WORLD_PROPERTY = "basemetals.integratedWorldSmokeName"; @@ -53,17 +54,30 @@ public final class IntegratedWorldSmoke { private static boolean projectileRenderersChecked; private static boolean projectileSyncProbesSpawned; private static boolean projectileSyncChecked; + private static boolean registered; private IntegratedWorldSmoke() {} @SubscribeEvent - public static void onClientTick(TickEvent.ClientTickEvent event) { - if (event.phase != TickEvent.Phase.END || completed + public static void setup(net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent event) { + register(); + } + + public static void register() { + if (!registered) { + TickEvent.ClientTickEvent.Post.BUS.addListener(IntegratedWorldSmoke::onClientTick); + registered = true; + } + } + + public static void onClientTick(TickEvent.ClientTickEvent.Post event) { + if (completed || !Boolean.getBoolean(ENABLED_PROPERTY)) { return; } Minecraft minecraft = Minecraft.getInstance(); + minecraft.options.pauseOnLostFocus = false; if (minecraft.screen instanceof net.minecraft.client.gui.screens.AccessibilityOnboardingScreen) { minecraft.screen.onClose(); return; @@ -103,7 +117,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) { false, Difficulty.NORMAL, true, - new GameRules(), + new GameRules(net.minecraft.world.flag.FeatureFlags.DEFAULT_FLAGS), net.minecraft.world.level.WorldDataConfiguration.DEFAULT); BaseMetals.LOGGER.info("BASEMETALS_INTEGRATED_SMOKE creating world={}", worldName); minecraft.createWorldOpenFlows().createFreshLevel(worldName, levelSettings, @@ -118,7 +132,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) { } // Forge marks modded registries experimental. This applies only to the new smoke-test world. minecraft.screen.children().stream().filter(net.minecraft.client.gui.components.Button.class::isInstance) - .map(net.minecraft.client.gui.components.Button.class::cast).findFirst().orElseThrow().onPress(); + .map(net.minecraft.client.gui.components.Button.class::cast).findFirst().orElseThrow().onPress(new net.minecraft.client.input.KeyEvent(257, 0, 0)); } if (minecraft.hasSingleplayerServer() && minecraft.getSingleplayerServer() != null @@ -146,7 +160,8 @@ public static void onClientTick(TickEvent.ClientTickEvent event) { "BASEMETALS_INTEGRATED_SMOKE FAIL: projectile ammunition did not reach the client"); } } - if (joinedTicks >= READY_TICKS) { + if (joinedTicks >= READY_TICKS + && minecraft.getSingleplayerServer().getTickCount() >= READY_TICKS) { if (!projectileSyncChecked) { throw new IllegalStateException( "BASEMETALS_INTEGRATED_SMOKE FAIL: projectile sync was never verified"); @@ -155,7 +170,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) { BaseMetals.LOGGER.info( "BASEMETALS_INTEGRATED_SMOKE PASS world={} dimension={} client_ticks={} server_ticks={}", System.getProperty(WORLD_PROPERTY, "basemetals-integrated-smoke"), - minecraft.level.dimension().location(), elapsedTicks, + minecraft.level.dimension().identifier(), elapsedTicks, minecraft.getSingleplayerServer().getTickCount()); minecraft.stop(); return; @@ -169,6 +184,28 @@ public static void onClientTick(TickEvent.ClientTickEvent event) { } } + private static java.util.List quads( + net.minecraft.client.renderer.block.model.BlockStateModel model, net.minecraft.core.Direction face) { + var result = new java.util.ArrayList(); + for (var part : model.collectParts(net.minecraft.util.RandomSource.create(0))) { + result.addAll(part.getQuads(face)); + } + + return result; + } + + private static int[] vertices(net.minecraft.client.renderer.block.model.BakedQuad quad) { + int[] result = new int[32]; + for (int vertex = 0; vertex < 4; vertex++) { + var position = quad.position(vertex); + result[vertex * 8] = Float.floatToRawIntBits(position.x()); + result[vertex * 8 + 1] = Float.floatToRawIntBits(position.y()); + result[vertex * 8 + 2] = Float.floatToRawIntBits(position.z()); + } + + return result; + } + private static void verifyOreOverlayModels(Minecraft minecraft) { int ores = 0; for (var entry : ModContent.blocksById().entrySet()) { @@ -176,10 +213,10 @@ private static void verifyOreOverlayModels(Minecraft minecraft) { var state = entry.getValue().get().defaultBlockState(); var model = minecraft.getBlockRenderer().getBlockModel(state); for (var face : net.minecraft.core.Direction.values()) { - var quads = model.getQuads(state, face, net.minecraft.util.RandomSource.create(0)); + var quads = quads(model, face); if (quads.size() != 2) throw new IllegalStateException("Ore model lost a layer: " + entry.getKey()); boolean offset = quads.stream().anyMatch(quad -> { - int[] vertices = quad.getVertices(); + int[] vertices = vertices(quad); for (int index = 0; index < vertices.length; index += 8) { for (int axis = 0; axis < 3; axis++) { float coordinate = Float.intBitsToFloat(vertices[index + axis]); @@ -192,7 +229,7 @@ private static void verifyOreOverlayModels(Minecraft minecraft) { } var layers = model.getRenderTypes(state, net.minecraft.util.RandomSource.create(0), net.minecraftforge.client.model.data.ModelData.EMPTY); - if (!layers.contains(RenderType.cutout()) || layers.contains(RenderType.solid())) { + if (!layers.contains(ChunkSectionLayer.CUTOUT) || layers.contains(ChunkSectionLayer.SOLID)) { throw new IllegalStateException("Ore overlay is not cutout: " + entry.getKey()); } ores++; @@ -201,7 +238,7 @@ private static void verifyOreOverlayModels(Minecraft minecraft) { if (Boolean.getBoolean("basemetals.hostTextureProbe")) { try { var host = minecraft.getResourceManager().getResource( - net.minecraft.resources.ResourceLocation.parse("minecraft:textures/block/stone.png")); + net.minecraft.resources.Identifier.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"); } @@ -224,24 +261,24 @@ private static void verifyBarsModels(Minecraft minecraft) { } var model = minecraft.getBlockRenderer().getBlockModel(state); - var quads = new java.util.ArrayList<>(model.getQuads(state, null, net.minecraft.util.RandomSource.create(0))); + var quads = new java.util.ArrayList<>(quads(model, null)); for (var face : net.minecraft.core.Direction.values()) { - quads.addAll(model.getQuads(state, face, net.minecraft.util.RandomSource.create(0))); + quads.addAll(quads(model, face)); } for (int first = 0; first < quads.size(); first++) { for (int second = first + 1; second < quads.size(); second++) { var a = quads.get(first); var b = quads.get(second); - if (a.getDirection() != b.getDirection()) continue; + if (a.direction() != b.direction()) continue; - int axis = switch (a.getDirection().getAxis()) { + int axis = switch (a.direction().getAxis()) { case X -> 0; case Y -> 1; case Z -> 2; }; - float[][] aBounds = quadBounds(a.getVertices()); - float[][] bBounds = quadBounds(b.getVertices()); + float[][] aBounds = quadBounds(vertices(a)); + float[][] bBounds = quadBounds(vertices(b)); if (Math.abs(aBounds[0][axis] - bBounds[0][axis]) > 0.01F / 16) continue; boolean overlaps = true; @@ -287,21 +324,21 @@ private static void verifyBlockRenderLayers(Minecraft minecraft) { int trapdoors = 0; for (var reference : ModContent.blocksById().values()) { Block block = reference.get(); - RenderType expected = null; + ChunkSectionLayer expected = null; if (block instanceof IronBarsBlock) { - expected = RenderType.cutoutMipped(); + expected = ChunkSectionLayer.CUTOUT; bars++; } else if (block instanceof DoorBlock) { - expected = RenderType.cutout(); + expected = ChunkSectionLayer.CUTOUT; doors++; } else if (block instanceof TrapDoorBlock) { - expected = RenderType.cutout(); + expected = ChunkSectionLayer.CUTOUT; trapdoors++; } var state = block.defaultBlockState(); var layers = minecraft.getBlockRenderer().getBlockModel(state).getRenderTypes(state, net.minecraft.util.RandomSource.create(0), net.minecraftforge.client.model.data.ModelData.EMPTY); - if (expected != null && (!layers.contains(expected) || layers.contains(RenderType.solid()))) { + if (expected != null && (!layers.contains(expected) || layers.contains(ChunkSectionLayer.SOLID))) { throw new IllegalStateException("BASEMETALS_INTEGRATED_SMOKE FAIL: wrong render layer for " + net.minecraftforge.registries.ForgeRegistries.BLOCKS.getKey(block)); } @@ -344,6 +381,7 @@ private static void verifyCreativeBuckets(Minecraft minecraft) { } }); BaseMetals.LOGGER.info("BASEMETALS_CREATIVE_INVENTORY PASS visible={} hidden_fluid_blocks=36", shown.size()); + verifyItemModels(minecraft); java.util.List bucketSearch = minecraft.getConnection().searchTrees() .creativeNameSearch().search("bucket"); for (var fluid : ModContent.fluids().entrySet()) { @@ -358,17 +396,65 @@ private static void verifyCreativeBuckets(Minecraft minecraft) { + " direct_search=" + searchTab.size() + " indexed_bucket_results=" + bucketSearch.size()); } - var model = minecraft.getItemRenderer().getModel(bucketStack, null, null, 0); - if (model.getQuads(null, null, net.minecraft.util.RandomSource.create(0)).isEmpty()) { + var model = new net.minecraft.client.renderer.item.ItemStackRenderState(); + minecraft.getItemModelResolver().updateForTopItem(model, bucketStack, + net.minecraft.world.item.ItemDisplayContext.GUI, minecraft.level, null, 0); + if (model.isEmpty() || model.getModelBoundingBox().getSize() == 0) { throw new IllegalStateException( "BASEMETALS_INTEGRATED_SMOKE FAIL: invisible bucket model " + fluid.getKey()); } + + var quads = itemQuads(model); + var still = net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions + .of(fluid.getValue().source().get()).getStillTexture(); + if (quads.stream().noneMatch(quad -> quad.tintIndex() == 1 + && quad.sprite().contents().name().equals(still))) { + throw new IllegalStateException("Bucket has no tinted fluid layer: " + fluid.getKey()); + } } BaseMetals.LOGGER.info( "BASEMETALS_INTEGRATED_SMOKE creative buckets PASS count={}", ModContent.fluids().size()); } + private static void verifyItemModels(Minecraft minecraft) { + for (var entry : ModContent.itemsById().entrySet()) { + var state = new net.minecraft.client.renderer.item.ItemStackRenderState(); + minecraft.getItemModelResolver().updateForTopItem(state, + entry.getValue().get().getDefaultInstance(), + net.minecraft.world.item.ItemDisplayContext.GUI, minecraft.level, null, 0); + var quads = itemQuads(state); + + if (state.isEmpty() || quads.isEmpty() || quads.stream().anyMatch(quad -> + quad.sprite().contents().name().getPath().equals("missingno"))) { + throw new IllegalStateException("Missing item model or texture: " + entry.getKey()); + } + } + + BaseMetals.LOGGER.info("BASEMETALS_ITEM_MODELS PASS items={}", ModContent.itemsById().size()); + } + + private static java.util.List itemQuads( + net.minecraft.client.renderer.item.ItemStackRenderState state) { + try { + var layersField = state.getClass().getDeclaredField("layers"); + var countField = state.getClass().getDeclaredField("activeLayerCount"); + layersField.setAccessible(true); + countField.setAccessible(true); + var layers = (net.minecraft.client.renderer.item.ItemStackRenderState.LayerRenderState[]) + layersField.get(state); + var result = new java.util.ArrayList(); + + for (int index = 0; index < countField.getInt(state); index++) { + result.addAll(layers[index].prepareQuadList()); + } + + return result; + } catch (ReflectiveOperationException exception) { + throw new IllegalStateException("Could not inspect the native item render state", exception); + } + } + private static void verifyProjectileRenderers(Minecraft minecraft) { for (var type : java.util.List.of(ModEntities.CUSTOM_ARROW.get(), ModEntities.CUSTOM_BOLT.get())) { MaterialProjectile projectile = new MaterialProjectile(type, minecraft.level); diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java index 3fd05162b..7e6d8d3f4 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java @@ -9,8 +9,8 @@ import zone.moddev.mc.basemetals.entity.ModEntities; import zone.moddev.mc.basemetals.loot.ModLoot; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.bus.BusGroup; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; @@ -23,12 +23,13 @@ public final class BaseMetals { public static final Logger LOGGER = LogManager.getLogger(MOD_ID); public BaseMetals(FMLJavaModLoadingContext context) { - IEventBus modBus = context.getModEventBus(); + BusGroup modBus = context.getModBusGroup(); ModContent.register(modBus); ModTabs.register(modBus); zone.moddev.mc.basemetals.recipe.ContentRecipeCondition.SERIALIZERS.register(modBus); - modBus.addListener(BaseMetalsConfig::onConfigLoading); - modBus.addListener((net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent event) -> { + net.minecraftforge.fml.event.config.ModConfigEvent.Loading.getBus(modBus) + .addListener(BaseMetalsConfig::onConfigLoading); + FMLCommonSetupEvent.getBus(modBus).addListener(event -> { event.enqueueWork(() -> { zone.moddev.mc.basemetals.network.ContentModeNetwork.register(); }); @@ -38,6 +39,9 @@ public BaseMetals(FMLJavaModLoadingContext context) { ModEntities.register(modBus); ModLoot.register(modBus); context.registerConfig(ModConfig.Type.COMMON, BaseMetalsConfig.SPEC); - MinecraftForge.EVENT_BUS.register(new BaseMetalsEvents()); + if (net.minecraftforge.fml.loading.FMLEnvironment.dist == net.minecraftforge.api.distmarker.Dist.CLIENT) { + zone.moddev.mc.basemetals.client.ClientSetup.register(context); + } + BaseMetalsEvents.register(); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java index 1d547ead0..9f739e64f 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java @@ -8,12 +8,12 @@ import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementProgress; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.ArmorItem; +import zone.moddev.mc.basemetals.content.MaterialItems.Armor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; @@ -27,7 +27,7 @@ final class BaseMetalsAdvancements { private static final String CRITERION = "event"; private static final TagKey STORAGE_BLOCKS = BlockTags.create( - ResourceLocation.fromNamespaceAndPath("forge", "storage_blocks")); + Identifier.fromNamespaceAndPath("forge", "storage_blocks")); private static final Map ALLOY_ADVANCEMENTS = Map.ofEntries( Map.entry("aquarium", "aquarium_maker"), Map.entry("brass", "brass_maker"), @@ -43,7 +43,7 @@ private BaseMetalsAdvancements() {} static void onCrafted(ServerPlayer player, ItemStack result) { if (result.getItem() instanceof CrackhammerItem) award(player, "geologist"); - ResourceLocation id = ForgeRegistries.ITEMS.getKey(result.getItem()); + Identifier id = ForgeRegistries.ITEMS.getKey(result.getItem()); if (id != null && id.getNamespace().equals(BaseMetals.MOD_ID) && (id.getPath().endsWith("_blend") || id.getPath().endsWith("_smallblend"))) { award(player, "metallurgy"); @@ -56,7 +56,7 @@ static void onSmelted(ServerPlayer player, ItemStack result) { return; } - ResourceLocation id = ForgeRegistries.ITEMS.getKey(result.getItem()); + Identifier id = ForgeRegistries.ITEMS.getKey(result.getItem()); if (id == null || !id.getNamespace().equals(BaseMetals.MOD_ID) || !id.getPath().endsWith("_ingot")) { return; @@ -68,7 +68,7 @@ static void onSmelted(ServerPlayer player, ItemStack result) { } static void onPlaced(ServerPlayer player, BlockState state) { - ResourceLocation id = ForgeRegistries.BLOCKS.getKey(state.getBlock()); + Identifier id = ForgeRegistries.BLOCKS.getKey(state.getBlock()); 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"); @@ -97,7 +97,7 @@ private static boolean fullArmor(ServerPlayer player, String material) { for (EquipmentSlot slot : new EquipmentSlot[] { EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET}) { ItemStack stack = player.getItemBySlot(slot); - if (!(stack.getItem() instanceof ArmorItem) || !material(stack, material)) return false; + if (!(stack.getItem() instanceof Armor) || !material(stack, material)) return false; } return true; } @@ -113,8 +113,8 @@ private static boolean material(ItemStack stack, String expected) { } static boolean award(ServerPlayer player, String id) { - AdvancementHolder advancement = player.getServer().getAdvancements().get( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)); + AdvancementHolder advancement = player.level().getServer().getAdvancements().get( + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, id)); if (advancement == null) return false; AdvancementProgress progress = player.getAdvancements().getOrStartProgress(advancement); if (progress.isDone()) return false; diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java index 759616689..b781a137f 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -24,23 +24,22 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ArmorItem; +import zone.moddev.mc.basemetals.content.MaterialItems.Armor; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TieredItem; + import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraft.world.item.enchantment.EnchantmentHelper; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.ItemTags; import zone.moddev.mc.basemetals.content.ModContent; import zone.moddev.mc.basemetals.material.MaterialDefinition; import net.minecraftforge.event.level.BlockEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.Priority; import net.minecraftforge.event.village.VillagerTradesEvent; import zone.moddev.mc.basemetals.trade.BaseMetalsTrades; import zone.moddev.mc.basemetals.migration.Legacy112WorldMigrator; @@ -49,24 +48,36 @@ /** Forge event handlers for Base Metals. */ public final class BaseMetalsEvents { - @SubscribeEvent + public static void register() { + BaseMetalsEvents handlers = new BaseMetalsEvents(); + PlayerEvent.PlayerLoggedInEvent.BUS.addListener(handlers::onPlayerLogin); + ServerAboutToStartEvent.BUS.addListener(handlers::onServerAboutToStart); + BlockEvent.BreakEvent.BUS.addListener(Priority.LOWEST, handlers::onBreak); + TickEvent.PlayerTickEvent.Post.BUS.addListener(handlers::onPlayerTick); + LivingHurtEvent.BUS.addListener(handlers::onLivingHurt); + AnvilUpdateEvent.BUS.addListener(handlers::onShieldUpgrade); + PlayerEvent.ItemCraftedEvent.BUS.addListener(handlers::onItemCrafted); + PlayerEvent.ItemSmeltedEvent.BUS.addListener(handlers::onItemSmelted); + BlockEvent.EntityPlaceEvent.BUS.addListener(handlers::onBlockPlaced); + VillagerTradesEvent.BUS.addListener(handlers::onVillagerTrades); + } + public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { if (!(event.getEntity() instanceof ServerPlayer player)) return; var recipes = new ArrayList>(); - for (var recipe : player.server.getRecipeManager().getRecipes()) { - if (!recipe.id().getNamespace().equals(BaseMetals.MOD_ID) || recipe.value().isSpecial()) continue; + for (var recipe : player.level().getServer().getRecipeManager().getRecipes()) { + if (!recipe.id().identifier().getNamespace().equals(BaseMetals.MOD_ID) || recipe.value().isSpecial()) continue; - var unlock = player.server.getAdvancements().get(ResourceLocation.fromNamespaceAndPath( - BaseMetals.MOD_ID, "recipes/" + recipe.id().getPath())); + var unlock = player.level().getServer().getAdvancements().get(Identifier.fromNamespaceAndPath( + BaseMetals.MOD_ID, "recipes/" + recipe.id().identifier().getPath())); if (unlock != null && player.getAdvancements().getOrStartProgress(unlock).isDone()) recipes.add(recipe); } player.awardRecipes(recipes); } - @SubscribeEvent public void onServerAboutToStart(ServerAboutToStartEvent event) { try { java.nio.file.Path worldRoot = event.getServer().getWorldPath(LevelResource.ROOT); @@ -78,18 +89,18 @@ public void onServerAboutToStart(ServerAboutToStartEvent event) { } } - @SubscribeEvent(priority = EventPriority.LOWEST) public void onBreak(BlockEvent.BreakEvent event) { + if (event.getResult().isDenied()) return; if (!(event.getLevel() instanceof ServerLevel level) || !(event.getPlayer() instanceof ServerPlayer player)) { return; } ItemStack held = player.getMainHandItem(); if (held.getItem() instanceof CrackhammerItem && !player.isCreative() && event.getState().canHarvestBlock(level, event.getPos(), player)) { - Optional> recipe = level.getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), + Optional> recipe = level.getServer().getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), new SingleRecipeInput(new ItemStack(event.getState().getBlock())), level); if (recipe.isPresent()) { - event.setCanceled(true); + event.setResult(net.minecraftforge.common.util.Result.DENY); event.getState().getBlock().playerWillDestroy(level, event.getPos(), event.getState(), player); boolean removed = event.getState().onDestroyedByPlayer(level, event.getPos(), player, true, level.getFluidState(event.getPos())); @@ -108,10 +119,9 @@ public void onBreak(BlockEvent.BreakEvent event) { } } - @SubscribeEvent - public void onPlayerTick(TickEvent.PlayerTickEvent event) { - Player player = event.player; - if (event.phase != TickEvent.Phase.END || player.level().isClientSide) return; + public void onPlayerTick(TickEvent.PlayerTickEvent.Post event) { + Player player = event.player(); + if (player.level().isClientSide()) return; if (BaseMetalsConfig.STARSTEEL_REGENERATION.get() && player.tickCount % 200 == 0) { repairStarsteel(player.getMainHandItem()); repairStarsteel(player.getOffhandItem()); @@ -127,7 +137,7 @@ public void onPlayerTick(TickEvent.PlayerTickEvent event) { private static void repairStarsteel(ItemStack stack) { if (stack.getItem() instanceof MaterialBacked backed - && !(stack.getItem() instanceof ArmorItem) + && !(stack.getItem() instanceof Armor) && backed.baseMetalsMaterial().name().equals("starsteel") && stack.isDamaged()) { stack.setDamageValue(stack.getDamageValue() - 1); } @@ -138,7 +148,7 @@ private static Map armorMaterials(Player player) { for (EquipmentSlot slot : new EquipmentSlot[] { EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET}) { ItemStack stack = player.getItemBySlot(slot); - if (stack.getItem() instanceof ArmorItem && stack.getItem() instanceof MaterialBacked backed) { + if (stack.getItem() instanceof Armor && stack.getItem() instanceof MaterialBacked backed) { result.put(slot, backed.baseMetalsMaterial().name()); } } @@ -151,14 +161,14 @@ private static int count(Map armor, String material) { private static void applyArmorEffects(Player player, Map armor) { int adamantine = count(armor, "adamantine"); - if (adamantine >= 2) add(player, MobEffects.DAMAGE_RESISTANCE, adamantine == 4 ? 1 : 0); + if (adamantine >= 2) add(player, MobEffects.RESISTANCE, adamantine == 4 ? 1 : 0); int lead = count(armor, "lead"); - if (lead >= 2) add(player, MobEffects.MOVEMENT_SLOWDOWN, lead == 4 ? 1 : 0); + if (lead >= 2) add(player, MobEffects.SLOWNESS, lead == 4 ? 1 : 0); if (count(armor, "coldiron") == 4) add(player, MobEffects.FIRE_RESISTANCE, 0); if (count(armor, "aquarium") == 4 && player.isUnderWater()) { add(player, MobEffects.WATER_BREATHING, 0); - add(player, MobEffects.DAMAGE_RESISTANCE, 0); - player.removeEffect(MobEffects.DIG_SLOWDOWN); + add(player, MobEffects.RESISTANCE, 0); + player.removeEffect(MobEffects.MINING_FATIGUE); } if (count(armor, "mithril") == 4) { for (MobEffectInstance effect : new ArrayList<>(player.getActiveEffects())) { @@ -168,20 +178,19 @@ private static void applyArmorEffects(Player player, Map } } int starsteel = count(armor, "starsteel"); - if (starsteel > 0) add(player, MobEffects.JUMP, starsteel - 1); - if (starsteel >= 2) add(player, MobEffects.MOVEMENT_SPEED, Math.min(2, starsteel - 2)); + if (starsteel > 0) add(player, MobEffects.JUMP_BOOST, starsteel - 1); + if (starsteel >= 2) add(player, MobEffects.SPEED, Math.min(2, starsteel - 2)); } private static void add(Player player, net.minecraft.core.Holder effect, int amplifier) { player.addEffect(new MobEffectInstance(effect, 45, amplifier, false, false, true)); } - @SubscribeEvent public void onLivingHurt(LivingHurtEvent event) { - if (!BaseMetalsConfig.SPECIAL_EFFECTS.get() || event.getEntity().level().isClientSide + if (!BaseMetalsConfig.SPECIAL_EFFECTS.get() || event.getEntity().level().isClientSide() || !(event.getSource().getEntity() instanceof LivingEntity attacker)) return; ItemStack held = attacker.getMainHandItem(); - if (!(held.getItem() instanceof MaterialBacked backed) || !(held.getItem() instanceof TieredItem)) return; + if (!(held.getItem() instanceof MaterialBacked backed) || !held.has(net.minecraft.core.component.DataComponents.TOOL)) return; LivingEntity target = event.getEntity(); switch (backed.baseMetalsMaterial().name()) { case "adamantine" -> { @@ -203,7 +212,6 @@ public void onLivingHurt(LivingHurtEvent event) { } } - @SubscribeEvent public void onShieldUpgrade(AnvilUpdateEvent event) { if (!(event.getLeft().getItem() instanceof zone.moddev.mc.basemetals.content.MaterialItems.Shield shield) || event.getLeft().getCount() != 1 || event.getRight().getCount() != 1) return; @@ -211,7 +219,7 @@ public void onShieldUpgrade(AnvilUpdateEvent event) { MaterialDefinition upgrade = shieldMaterials().values().stream() .filter(candidate -> candidate.hardness() > current.hardness()) .filter(candidate -> event.getRight().is(ItemTags.create( - ResourceLocation.fromNamespaceAndPath("forge", "plates/" + candidate.name())))) + Identifier.fromNamespaceAndPath("forge", "plates/" + candidate.name())))) .sorted(Comparator.comparingDouble(MaterialDefinition::hardness) .thenComparing(MaterialDefinition::name)) .findFirst().orElse(null); @@ -243,28 +251,24 @@ static int shieldUpgradeCost(MaterialDefinition current, MaterialDefinition upgr + upgrade.magic() * enchantments)); } - @SubscribeEvent public void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { if (event.getEntity() instanceof ServerPlayer player) { BaseMetalsAdvancements.onCrafted(player, event.getCrafting()); } } - @SubscribeEvent public void onItemSmelted(PlayerEvent.ItemSmeltedEvent event) { if (event.getEntity() instanceof ServerPlayer player) { BaseMetalsAdvancements.onSmelted(player, event.getSmelting()); } } - @SubscribeEvent public void onBlockPlaced(BlockEvent.EntityPlaceEvent event) { if (event.getEntity() instanceof ServerPlayer player) { BaseMetalsAdvancements.onPlaced(player, event.getPlacedBlock()); } } - @SubscribeEvent public void onVillagerTrades(VillagerTradesEvent event) { BaseMetalsTrades.add(event); } diff --git a/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java b/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java index 04d5a4943..ddf4be213 100644 --- a/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java +++ b/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java @@ -6,9 +6,9 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraftforge.registries.MissingMappingsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; @@ -20,7 +20,7 @@ private MissingMappings() {} @SubscribeEvent public static void blocks(MissingMappingsEvent event) { for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(ForgeRegistries.Keys.BLOCKS)) { - ResourceLocation vanillaTarget = vanilla114Target(mapping.getKey()); + Identifier vanillaTarget = vanilla114Target(mapping.getKey()); if (vanillaTarget != null) { Block target = ForgeRegistries.BLOCKS.getValue(vanillaTarget); if (target != null) mapping.remap(target); @@ -35,7 +35,7 @@ public static void blocks(MissingMappingsEvent event) { @SubscribeEvent public static void items(MissingMappingsEvent event) { for (MissingMappingsEvent.Mapping mapping : event.getAllMappings(ForgeRegistries.Keys.ITEMS)) { - ResourceLocation vanillaTarget = vanilla114Target(mapping.getKey()); + Identifier vanillaTarget = vanilla114Target(mapping.getKey()); if (vanillaTarget != null) { Item target = ForgeRegistries.ITEMS.getValue(vanillaTarget); if (target != null) mapping.remap(target); @@ -60,17 +60,17 @@ private static boolean isLegacyNamespace(String namespace) { return BaseMetals.MOD_ID.equals(namespace) || "mmdlib".equals(namespace); } - public static ResourceLocation vanilla114Target(ResourceLocation oldName) { + public static Identifier vanilla114Target(Identifier oldName) { if (!"minecraft".equals(oldName.getNamespace())) return null; // Vanilla converts the saved blocks and items, but Forge's registry // snapshot still needs aliases for names retired in 1.14. switch (oldName.getPath()) { - case "sign": return ResourceLocation.fromNamespaceAndPath("minecraft", "oak_sign"); - case "wall_sign": return ResourceLocation.fromNamespaceAndPath("minecraft", "oak_wall_sign"); - case "rose_red": return ResourceLocation.fromNamespaceAndPath("minecraft", "red_dye"); - case "cactus_green": return ResourceLocation.fromNamespaceAndPath("minecraft", "green_dye"); - case "dandelion_yellow": return ResourceLocation.fromNamespaceAndPath("minecraft", "yellow_dye"); + case "sign": return Identifier.fromNamespaceAndPath("minecraft", "oak_sign"); + case "wall_sign": return Identifier.fromNamespaceAndPath("minecraft", "oak_wall_sign"); + case "rose_red": return Identifier.fromNamespaceAndPath("minecraft", "red_dye"); + case "cactus_green": return Identifier.fromNamespaceAndPath("minecraft", "green_dye"); + case "dandelion_yellow": return Identifier.fromNamespaceAndPath("minecraft", "yellow_dye"); default: return null; } } @@ -85,10 +85,10 @@ public static String itemTargetPath(String path) { return path.endsWith("_door_item") ? path.substring(0, path.length() - "_item".length()) : path; } - public static ResourceLocation itemTargetId(String path) { + public static Identifier itemTargetId(String path) { return "iron_nugget".equals(path) - ? ResourceLocation.fromNamespaceAndPath("minecraft", "iron_nugget") - : ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, itemTargetPath(path)); + ? Identifier.fromNamespaceAndPath("minecraft", "iron_nugget") + : Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, itemTargetPath(path)); } public static String fluidTargetPath(String name) { diff --git a/src/main/java/zone/moddev/mc/basemetals/ModTabs.java b/src/main/java/zone/moddev/mc/basemetals/ModTabs.java index bb4ffaef1..b69759835 100644 --- a/src/main/java/zone/moddev/mc/basemetals/ModTabs.java +++ b/src/main/java/zone/moddev/mc/basemetals/ModTabs.java @@ -6,7 +6,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.core.registries.Registries; -import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; import zone.moddev.mc.basemetals.content.BaseMetalAmmoItem; @@ -26,7 +26,7 @@ public final class ModTabs { private ModTabs() {} - public static void register(IEventBus bus) { + public static void register(BusGroup bus) { TABS.register(bus); } diff --git a/src/main/java/zone/moddev/mc/basemetals/ModTags.java b/src/main/java/zone/moddev/mc/basemetals/ModTags.java index 570f62abc..5f01a42bb 100644 --- a/src/main/java/zone/moddev/mc/basemetals/ModTags.java +++ b/src/main/java/zone/moddev/mc/basemetals/ModTags.java @@ -1,16 +1,16 @@ package zone.moddev.mc.basemetals; import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; public final class ModTags { public static final TagKey SCYTHE_HARVESTABLE = BlockTags.create( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "scythe_harvestable")); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, "scythe_harvestable")); public static final TagKey CRACKHAMMER_CRUSHABLE = BlockTags.create( - ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "crackhammer_crushable")); + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, "crackhammer_crushable")); private ModTags() {} } diff --git a/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java index eaf155c15..e3001d8de 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java @@ -2,15 +2,14 @@ import java.util.ArrayList; import java.util.List; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.util.FormattedCharSequence; - +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.ConfirmScreen; -import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; +import net.minecraft.network.chat.Component; +import net.minecraft.util.FormattedCharSequence; import net.minecraftforge.common.ForgeConfigSpec; import zone.moddev.mc.basemetals.config.BaseMetalsConfig; @@ -34,7 +33,7 @@ public final class BaseMetalsConfigScreen extends Screen { private OptionButton modeButton; public BaseMetalsConfigScreen(Screen parent) { - super(net.minecraft.network.chat.Component.translatable(PREFIX + "title")); + super(Component.translatable(PREFIX + "title")); this.parent = parent; this.edits = new ConfigEdits(ContentMode.parse(BaseMetalsConfig.CONTENT_MODE.get()), VALUES[0].get(), VALUES[1].get(), VALUES[2].get(), VALUES[3].get()); @@ -83,26 +82,29 @@ private String optionLabel(int index) { } private void initLabels() { - modeButton.setMessage(net.minecraft.network.chat.Component.literal(modeLabel())); + modeButton.setMessage(Component.literal(modeLabel())); for (int index = 0; index < optionButtons.size(); index++) { - optionButtons.get(index).setMessage(net.minecraft.network.chat.Component.literal(optionLabel(index))); + optionButtons.get(index).setMessage(Component.literal(optionLabel(index))); } } private void done() { if (edits.modeChanged()) { minecraft.setScreen(new ConfirmScreen(this::confirmResult, - net.minecraft.network.chat.Component.translatable(PREFIX + "confirm.title"), - net.minecraft.network.chat.Component.translatable(PREFIX + "confirm.message"))); + Component.translatable(PREFIX + "confirm.title"), + Component.translatable(PREFIX + "confirm.message"))); } else { saveAndClose(); } } private void confirmResult(boolean accepted) { - if (accepted) saveAndClose(); - else minecraft.setScreen(this); + if (accepted) { + saveAndClose(); + } else { + minecraft.setScreen(this); + } } private void saveAndClose() { @@ -122,29 +124,30 @@ public void onClose() { public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { renderBackground(graphics, mouseX, mouseY, partialTicks); super.render(graphics, mouseX, mouseY, partialTicks); - graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFF); + graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFFFF); for (net.minecraft.client.gui.components.events.GuiEventListener child : children()) { if (child instanceof OptionButton && ((OptionButton) child).isHoveredOrFocused()) { String key = ((OptionButton) child).option; if (key != null) { List help = new ArrayList<>(font.split( - net.minecraft.network.chat.Component.translatable(PREFIX + key + ".tooltip"), 280)); + Component.translatable(PREFIX + key + ".tooltip"), 280)); if ("contentMode".equals(key)) { - help.addAll(font.split(net.minecraft.network.chat.Component.translatable(edits.mode().translationKey() + ".description"), 280)); - help.addAll(font.split(net.minecraft.network.chat.Component.translatable(PREFIX + "restart"), 280)); + help.addAll(font.split(Component.translatable( + edits.mode().translationKey() + ".description"), 280)); + help.addAll(font.split(Component.translatable(PREFIX + "restart"), 280)); } - graphics.renderTooltip(font, help, mouseX, mouseY); + graphics.setTooltipForNextFrame(help, mouseX, mouseY); } } } } - private static final class OptionButton extends Button { + private static final class OptionButton extends Button.Plain { private final String option; private OptionButton(int x, int y, int width, String label, Runnable click, String option) { - super(x, y, width, 20, net.minecraft.network.chat.Component.literal(label), button -> click.run(), DEFAULT_NARRATION); + super(x, y, width, 20, Component.literal(label), button -> click.run(), DEFAULT_NARRATION); this.option = option; } 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 8631c141a..4ed024395 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java @@ -6,9 +6,8 @@ import zone.moddev.mc.basemetals.entity.ModEntities; import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.FishingRodItem; import net.minecraft.world.level.block.Block; @@ -17,71 +16,51 @@ import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public final class ClientSetup { private ClientSetup() {} - @SubscribeEvent + public static void register(net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext context) { + EntityRenderersEvent.RegisterRenderers.BUS.addListener(ClientSetup::registerRenderers); + FMLClientSetupEvent.getBus(context.getModBusGroup()).addListener(ClientSetup::clientSetup); + context.registerExtensionPoint( + net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory.class, + () -> new net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory( + (minecraft, parent) -> new BaseMetalsConfigScreen(parent))); + } + public static void registerRenderers(EntityRenderersEvent.RegisterRenderers event) { event.registerEntityRenderer(ModEntities.CUSTOM_ARROW.get(), MaterialProjectileRenderer::new); event.registerEntityRenderer(ModEntities.CUSTOM_BOLT.get(), MaterialProjectileRenderer::new); } - @SubscribeEvent public static void clientSetup(FMLClientSetupEvent event) { - net.minecraftforge.fml.ModLoadingContext.get().registerExtensionPoint( - net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory.class, - () -> new net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory( - (minecraft, parent) -> new BaseMetalsConfigScreen(parent))); event.enqueueWork(() -> { zone.moddev.mc.orespawn.api.client.WorldSettingsExtensionRegistry.registerConfigScreen( BaseMetals.MOD_ID, BaseMetalsConfigScreen::new); ModContent.blocksById().forEach((id, block) -> { - if (id.endsWith("_ore")) ItemBlockRenderTypes.setRenderLayer(block.get(), RenderType.cutout()); + if (id.endsWith("_ore")) ItemBlockRenderTypes.setRenderLayer(block.get(), ChunkSectionLayer.CUTOUT); }); ModContent.fluids().values().forEach(fluid -> { - ItemBlockRenderTypes.setRenderLayer(fluid.source().get(), RenderType.translucent()); - ItemBlockRenderTypes.setRenderLayer(fluid.flowing().get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(fluid.source().get(), ChunkSectionLayer.TRANSLUCENT); + ItemBlockRenderTypes.setRenderLayer(fluid.flowing().get(), ChunkSectionLayer.TRANSLUCENT); }); ModContent.blocksById().values().stream() .map(entry -> entry.get()) .forEach(ClientSetup::registerBlockRenderLayer); - ModContent.itemsById().values().forEach(entry -> { - net.minecraft.world.item.Item item = entry.get(); - 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) - 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); - } - if (item instanceof MaterialItems.Shield) { - ItemProperties.register(item, ResourceLocation.parse("blocking"), (stack, level, user, seed) -> - user != null && user.isUsingItem() && user.getUseItem() == stack ? 1.0F : 0.0F); - } - if (item instanceof MaterialItems.FishingRod) { - ItemProperties.register(item, ResourceLocation.parse("cast"), (stack, level, user, seed) -> { - if (user == null) return 0.0F; - boolean main = user.getMainHandItem() == stack; - boolean off = user.getOffhandItem() == stack; - if (user.getMainHandItem().getItem() instanceof FishingRodItem) off = false; - return (main || off) && user instanceof Player player && player.fishing != null ? 1.0F : 0.0F; - }); - } - }); + }); } private static void registerBlockRenderLayer(Block block) { if (block instanceof IronBarsBlock) { - ItemBlockRenderTypes.setRenderLayer(block, RenderType.cutoutMipped()); + ItemBlockRenderTypes.setRenderLayer(block, ChunkSectionLayer.CUTOUT); } else if (block instanceof DoorBlock || block instanceof TrapDoorBlock) { - ItemBlockRenderTypes.setRenderLayer(block, RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(block, ChunkSectionLayer.CUTOUT); } } } 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 f84848842..411fbd636 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java @@ -1,53 +1,61 @@ package zone.moddev.mc.basemetals.client; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import org.joml.Matrix3f; -import org.joml.Matrix4f; -import zone.moddev.mc.basemetals.content.MaterialBacked; -import zone.moddev.mc.basemetals.entity.MaterialProjectile; - -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.ArrowRenderer; +import com.mojang.math.Axis; +import net.minecraft.client.model.geom.ModelLayers; +import net.minecraft.client.model.object.projectile.ArrowModel; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; -import net.minecraft.client.renderer.entity.TippableArrowRenderer; +import net.minecraft.client.renderer.entity.state.ArrowRenderState; +import net.minecraft.client.renderer.rendertype.RenderTypes; +import net.minecraft.client.renderer.state.CameraRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import zone.moddev.mc.basemetals.content.MaterialBacked; +import zone.moddev.mc.basemetals.entity.MaterialProjectile; -/** - * Uses vanilla's trajectory-aligned arrow geometry while tinting it from the - * exact ammunition item retained by the shared projectile entity. - */ -public final class MaterialProjectileRenderer extends ArrowRenderer { - private int colour = 0xFFFFFF; +/** Vanilla arrow geometry, with the ammunition's colour kept in its own render state. */ +public final class MaterialProjectileRenderer + extends EntityRenderer { + private static final Identifier TEXTURE = Identifier.withDefaultNamespace( + "textures/entity/projectiles/arrow.png"); + private final ArrowModel model; public MaterialProjectileRenderer(EntityRendererProvider.Context context) { super(context); + model = new ArrowModel(context.bakeLayer(ModelLayers.ARROW)); } @Override - public void render(MaterialProjectile projectile, float yaw, float partialTicks, - PoseStack poses, MultiBufferSource buffers, int packedLight) { - colour = projectile.getItem().getItem() instanceof MaterialBacked backed - ? backed.baseMetalsMaterial().colour() - : 0xFFFFFF; - super.render(projectile, yaw, partialTicks, poses, buffers, packedLight); + public State createRenderState() { + return new State(); } @Override - 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.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); + public void extractRenderState(MaterialProjectile projectile, State state, float partialTicks) { + super.extractRenderState(projectile, state, partialTicks); + state.xRot = projectile.getXRot(partialTicks); + state.yRot = projectile.getYRot(partialTicks); + state.shake = projectile.shakeTime - partialTicks; + state.colour = 0xFF000000 | (projectile.getItem().getItem() instanceof MaterialBacked backed + ? backed.baseMetalsMaterial().colour() : 0xFFFFFF); } @Override - public ResourceLocation getTextureLocation(MaterialProjectile projectile) { - return TippableArrowRenderer.NORMAL_ARROW_LOCATION; + public void submit(State state, PoseStack poses, SubmitNodeCollector collector, CameraRenderState camera) { + poses.pushPose(); + poses.mulPose(Axis.YP.rotationDegrees(state.yRot - 90.0F)); + poses.mulPose(Axis.ZP.rotationDegrees(state.xRot)); + collector.submitModel(model, state, poses, RenderTypes.entityCutout(TEXTURE), + state.lightCoords, OverlayTexture.NO_OVERLAY, state.colour, null, + state.outlineColor, null); + poses.popPose(); + + super.submit(state, poses, collector, camera); + } + + public static final class State extends ArrowRenderState { + public int colour = 0xFFFFFFFF; } } diff --git a/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java b/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java index 5ba6055f6..c66d3bb34 100644 --- a/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java +++ b/src/main/java/zone/moddev/mc/basemetals/compat/VanillaCopper.java @@ -4,21 +4,45 @@ /** 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 EQUIVALENTS = Map.ofEntries( + Map.entry("basemetals:copper_ingot", "minecraft:copper_ingot"), + Map.entry("basemetals:copper_nugget", "minecraft:copper_nugget"), + Map.entry("basemetals:copper_block", "minecraft:copper_block"), + Map.entry("basemetals:copper_door", "minecraft:copper_door"), + Map.entry("basemetals:copper_trapdoor", "minecraft:copper_trapdoor"), + Map.entry("basemetals:copper_slab", "minecraft:cut_copper_slab"), + Map.entry("basemetals:copper_stairs", "minecraft:cut_copper_stairs"), + Map.entry("basemetals:copper_bars", "minecraft:copper_bars"), + Map.entry("basemetals:copper_pickaxe", "minecraft:copper_pickaxe"), + Map.entry("basemetals:copper_axe", "minecraft:copper_axe"), + Map.entry("basemetals:copper_shovel", "minecraft:copper_shovel"), + Map.entry("basemetals:copper_hoe", "minecraft:copper_hoe"), + Map.entry("basemetals:copper_sword", "minecraft:copper_sword"), + Map.entry("basemetals:copper_helmet", "minecraft:copper_helmet"), + Map.entry("basemetals:copper_chestplate", "minecraft:copper_chestplate"), + Map.entry("basemetals:copper_leggings", "minecraft:copper_leggings"), + Map.entry("basemetals:copper_boots", "minecraft:copper_boots"), + Map.entry("basemetals:copper_horse_armor", "minecraft:copper_horse_armor")); - 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 static final Map INGREDIENT_TAGS = Map.ofEntries( + Map.entry("basemetals:copper_ingot", "forge:ingots/copper"), + Map.entry("basemetals:copper_nugget", "forge:nuggets/copper"), + Map.entry("basemetals:copper_block", "forge:storage_blocks/copper"), + Map.entry("basemetals:copper_door", "forge:doors/copper"), + Map.entry("basemetals:copper_trapdoor", "forge:trapdoors/copper"), + Map.entry("basemetals:copper_slab", "forge:slabs/copper"), + Map.entry("basemetals:copper_stairs", "forge:stairs/copper"), + Map.entry("basemetals:copper_bars", "forge:bars/copper"), + Map.entry("basemetals:copper_pickaxe", "forge:tools/pickaxes/copper"), + Map.entry("basemetals:copper_axe", "forge:tools/axes/copper"), + Map.entry("basemetals:copper_shovel", "forge:tools/shovels/copper"), + Map.entry("basemetals:copper_hoe", "forge:tools/hoes/copper"), + Map.entry("basemetals:copper_sword", "forge:tools/swords/copper"), + Map.entry("basemetals:copper_helmet", "forge:armors/helmets/copper"), + Map.entry("basemetals:copper_chestplate", "forge:armors/chestplates/copper"), + Map.entry("basemetals:copper_leggings", "forge:armors/leggings/copper"), + Map.entry("basemetals:copper_boots", "forge:armors/boots/copper"), + Map.entry("basemetals:copper_horse_armor", "forge:armors/horse/copper")); private VanillaCopper() {} 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 c67d809d4..33dc54391 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAmmoItem.java @@ -7,7 +7,7 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.projectile.AbstractArrow; +import net.minecraft.world.entity.projectile.arrow.AbstractArrow; import net.minecraft.world.item.ArrowItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java index 7c32c691c..43330cfd3 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalAnvilBlock.java @@ -10,11 +10,9 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AnvilMenu; import net.minecraft.world.inventory.ContainerLevelAccess; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.AnvilBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; @@ -43,13 +41,8 @@ public MenuProvider getMenuProvider(BlockState state, Level level, BlockPos pos) } private static final class DurableAnvilMenu extends AnvilMenu { - private final Level level; - private final BlockPos pos; - private DurableAnvilMenu(int containerId, Inventory inventory, Level level, BlockPos pos) { super(containerId, inventory, ContainerLevelAccess.create(level, pos)); - this.level = level; - this.pos = pos.immutable(); } @Override @@ -57,29 +50,5 @@ protected boolean isValidBlock(BlockState state) { return state.getBlock() instanceof BaseMetalAnvilBlock; } - @Override - protected void onTake(Player player, ItemStack output) { - BlockState original = level.getBlockState(pos); - if (!(original.getBlock() instanceof BaseMetalAnvilBlock)) { - super.onTake(player, output); - return; - } - - int damage = original.getValue(DAMAGE); - Block placeholder = switch (damage) { - case 0 -> Blocks.ANVIL; - case 1 -> Blocks.CHIPPED_ANVIL; - default -> Blocks.DAMAGED_ANVIL; - }; - level.setBlock(pos, placeholder.defaultBlockState().setValue(FACING, original.getValue(FACING)), 2); - super.onTake(player, output); - - BlockState after = level.getBlockState(pos); - if (after.is(placeholder)) { - level.setBlock(pos, original, 2); - } else if (damage < 2 && (after.is(Blocks.CHIPPED_ANVIL) || after.is(Blocks.DAMAGED_ANVIL))) { - level.setBlock(pos, original.setValue(DAMAGE, damage + 1), 2); - } - } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java index f3e22327a..de1586253 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java @@ -11,7 +11,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionResult; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ClipContext; @@ -38,25 +38,25 @@ public BaseMetalBucketItem(Supplier fluid, Properties propertie } @Override - public InteractionResultHolder use(Level level, net.minecraft.world.entity.player.Player player, + public InteractionResult use(Level level, net.minecraft.world.entity.player.Player player, InteractionHand hand) { ItemStack held = player.getItemInHand(hand); BlockHitResult hit = getPlayerPOVHitResult(level, player, ClipContext.Fluid.NONE); - InteractionResultHolder forgeResult = ForgeEventFactory.onBucketUse(player, level, held, hit); + InteractionResult forgeResult = ForgeEventFactory.onBucketUse(player, level, held, hit); if (forgeResult != null) return forgeResult; - if (hit.getType() != HitResult.Type.BLOCK) return InteractionResultHolder.pass(held); + if (hit.getType() != HitResult.Type.BLOCK) return InteractionResult.PASS; BlockPos clicked = hit.getBlockPos(); Direction direction = hit.getDirection(); BlockPos adjacent = clicked.relative(direction); if (!level.mayInteract(player, clicked) || !player.mayUseItemAt(adjacent, direction, held)) { - return InteractionResultHolder.fail(held); + return InteractionResult.FAIL; } BlockState clickedState = level.getBlockState(clicked); BlockPos destination = canContainFluid(level, clicked, clickedState) ? clicked : adjacent; if (!emptyContents(player, level, destination, hit, held, hand)) { - return InteractionResultHolder.fail(held); + return InteractionResult.FAIL; } checkExtraContent(player, level, held, destination); @@ -65,10 +65,9 @@ public InteractionResultHolder use(Level level, net.minecraft.world.e } player.awardStat(Stats.ITEM_USED.get(this)); level.gameEvent(player, GameEvent.FLUID_PLACE, destination); - return InteractionResultHolder.sidedSuccess(getEmptySuccessItem(held, player), level.isClientSide()); + return InteractionResult.SUCCESS.heldItemTransformedTo(getEmptySuccessItem(held, player)); } - @Override public boolean emptyContents(@Nullable net.minecraft.world.entity.player.Player player, Level level, BlockPos position, @Nullable BlockHitResult hit) { return emptyContents(player, level, position, hit, getDefaultInstance()); 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 590d9c114..9fe1aeea7 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java @@ -11,7 +11,9 @@ 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; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.component.TooltipDisplay; +import java.util.function.Consumer; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; @@ -22,14 +24,13 @@ import net.minecraftforge.common.ToolAction; import net.minecraftforge.common.ToolActions; -public final class CrackhammerItem extends DiggerItem implements MaterialBacked { +public final class CrackhammerItem extends Item implements MaterialBacked { private final MaterialDefinition material; public CrackhammerItem(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), BlockTags.MINEABLE_WITH_PICKAXE, - properties.durability(material.crackhammerDurability()).attributes( - DiggerItem.createAttributes(new MaterialTier(material), - 5.0F + material.baseAttackDamage(), -3.5F))); + super(properties.pickaxe(new MaterialTier(material).toolMaterial(), + 5.0F + material.baseAttackDamage(), -3.5F) + .durability(material.crackhammerDurability())); this.material = material; } @@ -50,14 +51,14 @@ public boolean canPerformAction(ItemStack stack, ToolAction action) { @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, + TooltipDisplay display, Consumer tooltip, net.minecraft.world.item.TooltipFlag flag) { MaterialItems.addToolTooltip(material, tooltip); } @Override public InteractionResult useOn(UseOnContext context) { - if (context.getClickedFace() != Direction.UP || context.getLevel().isClientSide + if (context.getClickedFace() != Direction.UP || context.getLevel().isClientSide() || context.getPlayer() == null) { return InteractionResult.PASS; } @@ -66,7 +67,7 @@ public InteractionResult useOn(UseOnContext context) { entity -> entity.isAlive() && !entity.getItem().isEmpty()); for (ItemEntity entity : entities) { ItemStack input = entity.getItem(); - Optional> recipe = context.getLevel().getRecipeManager().getRecipeFor( + Optional> recipe = ((net.minecraft.server.level.ServerLevel) context.getLevel()).getServer().getRecipeManager().getRecipeFor( 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 @@ -83,7 +84,7 @@ public InteractionResult useOn(UseOnContext context) { if (input.isEmpty()) entity.discard(); else entity.setItem(input); spawnOutputs(context.getLevel(), entity, output, operations); hammer.hurtAndBreak(operations, context.getPlayer(), - net.minecraft.world.entity.LivingEntity.getSlotForHand(context.getHand())); + zone.moddev.mc.basemetals.content.MaterialItems.handSlot(context.getHand())); context.getLevel().playSound(null, context.getClickedPos(), net.minecraft.sounds.SoundEvents.GRAVEL_BREAK, net.minecraft.sounds.SoundSource.BLOCKS, 0.5F, diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java index 81e48bf0a..cc904f66b 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java @@ -2,53 +2,45 @@ import java.util.EnumMap; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; -import net.minecraft.core.Holder; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; +import net.minecraft.world.item.equipment.ArmorMaterial; +import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.item.equipment.EquipmentAssets; import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.material.MaterialDefinition; -/** Registered armour materials shared by worn armour and horse armour. */ +/** Shared equipment properties for each material. */ public final class MaterialArmor { - private static final DeferredRegister MATERIALS = - DeferredRegister.create(Registries.ARMOR_MATERIAL, BaseMetals.MOD_ID); - private static final Map> BY_NAME = new LinkedHashMap<>(); + private static final Map BY_NAME = new LinkedHashMap<>(); private MaterialArmor() {} public static void register(MaterialDefinition material) { - BY_NAME.computeIfAbsent(material.name(), name -> MATERIALS.register(name, () -> create(material))); + BY_NAME.computeIfAbsent(material.name(), name -> create(material)); } - public static void register(IEventBus bus) { - MATERIALS.register(bus); - } - - public static Holder get(MaterialDefinition material) { - return BY_NAME.get(material.name()).getHolder().orElseThrow(); + public static ArmorMaterial get(MaterialDefinition material) { + return BY_NAME.get(material.name()); } private static ArmorMaterial create(MaterialDefinition material) { - Map defense = new EnumMap<>(ArmorItem.Type.class); - for (ArmorItem.Type type : ArmorItem.Type.values()) { - defense.put(type, type == ArmorItem.Type.BODY + Map defense = new EnumMap<>(ArmorType.class); + + for (ArmorType type : ArmorType.values()) { + defense.put(type, type == ArmorType.BODY ? material.horseArmorProtection() : material.armorProtection(type.getSlot())); } - return new ArmorMaterial(defense, material.enchantability(), SoundEvents.ARMOR_EQUIP_IRON, - () -> Ingredient.of(ItemTags.create(ResourceLocation.parse(material.repairIngredientTag()))), - List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, material.name()))), - material.armorToughness(), 0.0F); + return new ArmorMaterial(material.armorDurabilityFactor(), defense, + material.enchantability(), SoundEvents.ARMOR_EQUIP_IRON, + material.armorToughness(), 0.0F, + ItemTags.create(Identifier.parse(material.repairIngredientTag())), + ResourceKey.create(EquipmentAssets.ROOT_ID, + Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, material.name()))); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java index 674c8fda0..29bdb78ae 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java @@ -2,7 +2,7 @@ import zone.moddev.mc.basemetals.material.MaterialDefinition; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; @@ -10,7 +10,7 @@ public interface MaterialBacked { MaterialDefinition baseMetalsMaterial(); default boolean isMaterialRepairIngredient(ItemStack repair) { - return repair.is(ItemTags.create(ResourceLocation.parse( + return repair.is(ItemTags.create(Identifier.parse( baseMetalsMaterial().repairIngredientTag()))); } } 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 5372db768..163bac708 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.core.registries.Registries; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -17,22 +17,18 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.projectile.AbstractArrow; -import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.entity.projectile.arrow.AbstractArrow; import net.minecraft.world.item.AxeItem; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BowItem; import net.minecraft.world.item.FishingRodItem; import net.minecraft.world.item.HoeItem; -import net.minecraft.world.item.AnimalArmorItem; import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.item.Item; -import net.minecraft.world.item.PickaxeItem; import net.minecraft.world.item.ShearsItem; import net.minecraft.world.item.ShieldItem; import net.minecraft.world.item.ShovelItem; -import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; @@ -41,6 +37,9 @@ import net.minecraft.world.level.Level; import javax.annotation.Nullable; import java.util.List; +import java.util.function.Consumer; +import net.minecraft.world.item.component.TooltipDisplay; +import net.minecraft.world.item.equipment.ArmorType; import java.util.function.Predicate; import net.minecraft.world.item.ItemStack; @@ -62,105 +61,93 @@ public Basic(MaterialDefinition material, int burnTime, Properties properties) { } } - public static final class Pickaxe extends PickaxeItem implements MaterialBacked { + public static final class Pickaxe extends Item implements MaterialBacked { private final MaterialDefinition material; public Pickaxe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes( - toolAttributes(material, 1, -2.8F))); + super(properties.pickaxe(new MaterialTier(material).toolMaterial(), 1, -2.8F)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static final class Axe extends AxeItem implements MaterialBacked { private final MaterialDefinition material; public Axe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes( - toolAttributes(material, 4.0F + material.baseAttackDamage(), material.axeAttackSpeed()))); + super(new MaterialTier(material).toolMaterial(), 4.0F + material.baseAttackDamage(), + material.axeAttackSpeed(), properties); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static final class Shovel extends ShovelItem implements MaterialBacked { private final MaterialDefinition material; public Shovel(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes(toolAttributes(material, 1.5F, -3.0F))); + super(new MaterialTier(material).toolMaterial(), 1.5F, -3.0F, properties); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } 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_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())); + super(new MaterialTier(material).toolMaterial(), -material.baseAttackDamage(), + material.baseAttackDamage() - 3.0F, properties); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } - public static class Sword extends SwordItem implements MaterialBacked { + public static class Sword extends Item implements MaterialBacked { private final MaterialDefinition material; public Sword(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), properties.attributes( - SwordItem.createAttributes(new MaterialTier(material), 3, -2.4F))); + super(properties.sword(new MaterialTier(material).toolMaterial(), 3, -2.4F)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } - public static final class Armor extends ArmorItem implements MaterialBacked { + public static final class Armor extends Item implements MaterialBacked { private final MaterialDefinition material; public Armor(MaterialDefinition material, EquipmentSlot slot, Properties properties) { - super(MaterialArmor.get(material), armorType(slot), - properties.durability(armorType(slot).getDurability(material.armorDurabilityFactor()))); + super(properties.humanoidArmor(MaterialArmor.get(material), armorType(slot))); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addArmorTooltip(material, tooltip); } } - public static final class HorseArmor extends AnimalArmorItem implements MaterialBacked { + public static final class HorseArmor extends Item implements MaterialBacked { private final MaterialDefinition material; public HorseArmor(MaterialDefinition material, Properties properties) { - super(MaterialArmor.get(material), BodyType.EQUESTRIAN, false, properties.stacksTo(1)); + super(properties.horseArmor(MaterialArmor.get(material)).stacksTo(1)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } } - private static ItemAttributeModifiers toolAttributes(MaterialDefinition material, float damage, float speed) { - return net.minecraft.world.item.DiggerItem.createAttributes(new MaterialTier(material), damage, speed); - } - - private static ArmorItem.Type armorType(EquipmentSlot slot) { + private static ArmorType armorType(EquipmentSlot slot) { return switch (slot) { - case HEAD -> ArmorItem.Type.HELMET; - case CHEST -> ArmorItem.Type.CHESTPLATE; - case LEGS -> ArmorItem.Type.LEGGINGS; - case FEET -> ArmorItem.Type.BOOTS; + case HEAD -> ArmorType.HELMET; + case CHEST -> ArmorType.CHESTPLATE; + case LEGS -> ArmorType.LEGGINGS; + case FEET -> ArmorType.BOOTS; default -> throw new IllegalArgumentException("Not an armour slot: " + slot); }; } @@ -179,35 +166,29 @@ public BurnableBlock(net.minecraft.world.level.block.Block block, int burnTime, public static final class Shears extends ShearsItem implements MaterialBacked { private final MaterialDefinition material; - public Shears(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } + public Shears(MaterialDefinition material, Properties properties) { super(repairable(material, properties)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static class Shield extends ShieldItem implements MaterialBacked { private final MaterialDefinition material; - public Shield(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } + public Shield(MaterialDefinition material, Properties properties) { super(repairable(material, properties)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static class Bow extends BowItem implements MaterialBacked { private final MaterialDefinition material; - public Bow(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } + public Bow(MaterialDefinition material, Properties properties) { super(repairable(material, properties)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public Predicate getAllSupportedProjectiles() { return stack -> stack.getItem() instanceof net.minecraft.world.item.ArrowItem @@ -220,33 +201,27 @@ public static class Bow extends BowItem implements MaterialBacked { } @Override public AbstractArrow customArrow(AbstractArrow arrow) { - arrow.setBaseDamage(arrow.getBaseDamage() + material.baseAttackDamage() - 1.0D); + applyLauncherDamage(arrow, material); return arrow; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static final class Crossbow extends BowItem implements MaterialBacked { private final MaterialDefinition material; - public Crossbow(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } + public Crossbow(MaterialDefinition material, Properties properties) { super(repairable(material, properties)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override public Predicate getAllSupportedProjectiles() { return stack -> stack.getItem() instanceof BaseMetalAmmoItem ammo && ammo.kind() == BaseMetalAmmoItem.Kind.BOLT; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } @Override - public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int timeLeft) { - if (!(user instanceof Player player)) return; + public boolean releaseUsing(ItemStack bow, Level level, LivingEntity user, int timeLeft) { + if (!(user instanceof Player player)) return false; boolean hasInfiniteAmmo = player.getAbilities().instabuild || EnchantmentHelper.getItemEnchantmentLevel(player.registryAccess() .lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(Enchantments.INFINITY), bow) > 0; @@ -254,13 +229,13 @@ public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int time 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; + if (charge < 0 || ammunition.isEmpty() && !hasInfiniteAmmo) return false; if (ammunition.isEmpty()) { ammunition = ModContent.item("iron_bolt").get().getDefaultInstance(); } float power = getPowerForTime(charge); - if (power < 0.1F) return; + if (power < 0.1F) return false; BaseMetalAmmoItem boltItem = ammunition.getItem() instanceof BaseMetalAmmoItem ammo && ammo.kind() == BaseMetalAmmoItem.Kind.BOLT @@ -268,16 +243,17 @@ public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int time : (BaseMetalAmmoItem) ModContent.item("iron_bolt").get(); boolean infiniteShot = player.getAbilities().instabuild || boltItem.isInfinite(ammunition, bow, player); - if (!level.isClientSide) { + if (!level.isClientSide()) { AbstractArrow bolt = boltItem.createArrow(level, ammunition, player, bow); - bolt.setBaseDamage(bolt.getBaseDamage() + material.baseAttackDamage() - 1.0D); + applyLauncherDamage(bolt, material); bolt.shootFromRotation(player, player.getXRot(), player.getYRot(), 0.0F, power * 3.0F, 1.0F); if (power == 1.0F) bolt.setCritArrow(true); - // The saved weapon lets vanilla apply Power, Punch and Flame once. - bow.hurtAndBreak(1, player, LivingEntity.getSlotForHand(player.getUsedItemHand())); + // Keep the weapon for hit effects, and apply launch effects through vanilla's spawn path. + bow.hurtAndBreak(1, player, zone.moddev.mc.basemetals.content.MaterialItems.handSlot(player.getUsedItemHand())); if (infiniteShot) bolt.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; - level.addFreshEntity(bolt); + net.minecraft.world.entity.projectile.Projectile.spawnProjectile( + bolt, (net.minecraft.server.level.ServerLevel) level, ammunition); } level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ARROW_SHOOT, SoundSource.PLAYERS, 1.0F, @@ -287,6 +263,7 @@ public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int time if (ammunition.isEmpty()) player.getInventory().removeItem(ammunition); } player.awardStat(Stats.ITEM_USED.get(this)); + return true; } private ItemStack findBolt(Player player) { @@ -303,26 +280,41 @@ private ItemStack findBolt(Player player) { @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static final class FishingRod extends FishingRodItem implements MaterialBacked { private final MaterialDefinition material; - public FishingRod(MaterialDefinition material, Properties properties) { super(properties); this.material = material; } + public FishingRod(MaterialDefinition material, Properties properties) { super(repairable(material, properties)); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { - return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); - } @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } - static void addToolTooltip(MaterialDefinition material, List tooltip) { + public static EquipmentSlot handSlot(net.minecraft.world.InteractionHand hand) { + return hand == net.minecraft.world.InteractionHand.MAIN_HAND + ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND; + } + + private static void applyLauncherDamage(AbstractArrow arrow, MaterialDefinition launcher) { + double ammunitionDamage = arrow instanceof zone.moddev.mc.basemetals.entity.MaterialProjectile projectile + && projectile.getItem().getItem() instanceof MaterialBacked backed + ? backed.baseMetalsMaterial().baseAttackDamage() : 1.0D; + arrow.setBaseDamage(launcher.baseAttackDamage() + ammunitionDamage); + } + + private static Item.Properties repairable(MaterialDefinition material, Item.Properties properties) { + return properties.repairable(net.minecraft.tags.ItemTags.create( + Identifier.parse(material.repairIngredientTag()))) + .enchantable(material.enchantability()); + } + + static void addToolTooltip(MaterialDefinition material, Consumer tooltip) { Component component = switch (material.name()) { case "adamantine" -> net.minecraft.network.chat.Component.translatable("tooltip.adamantine.tool", 4); case "aquarium" -> net.minecraft.network.chat.Component.translatable("tooltip.aquarium.tool", 4); @@ -331,14 +323,14 @@ static void addToolTooltip(MaterialDefinition material, List tooltip) case "starsteel" -> net.minecraft.network.chat.Component.translatable("tooltip.starsteel.tool", 10); default -> null; }; - if (component != null) tooltip.add(component); + if (component != null) tooltip.accept(component); } - private static void addArmorTooltip(MaterialDefinition material, List tooltip) { + private static void addArmorTooltip(MaterialDefinition material, Consumer tooltip) { if (material.name().equals("adamantine") || material.name().equals("aquarium") || material.name().equals("coldiron") || material.name().equals("mithril") || material.name().equals("starsteel")) { - tooltip.add(net.minecraft.network.chat.Component.translatable("tooltip." + material.name() + ".armor")); + tooltip.accept(net.minecraft.network.chat.Component.translatable("tooltip." + material.name() + ".armor")); } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java b/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java index 791fc48b5..706bc9ed8 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java @@ -5,32 +5,38 @@ import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.material.MaterialDefinition; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Tier; +import net.minecraft.world.item.ToolMaterial; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.core.Registry; -public final class MaterialTier implements Tier { +public final class MaterialTier { private final MaterialDefinition material; private final Supplier repair; public MaterialTier(MaterialDefinition material) { this.material = material; - TagKey tag = ItemTags.create(ResourceLocation.parse(material.repairIngredientTag())); - this.repair = () -> Ingredient.of(tag); + TagKey tag = ItemTags.create(Identifier.parse(material.repairIngredientTag())); + this.repair = () -> Ingredient.of(net.minecraft.core.registries.BuiltInRegistries.ITEM + .getOrThrow(tag)); + } + + public ToolMaterial toolMaterial() { + return new ToolMaterial(getIncorrectBlocksForDrops(), getUses(), getSpeed(), + getAttackDamageBonus(), getEnchantmentValue(), + ItemTags.create(Identifier.parse(material.repairIngredientTag()))); } public MaterialDefinition material() { return material; } - @Override public int getUses() { return material.toolDurability(); } - @Override public float getSpeed() { return material.toolEfficiency(); } - @Override public float getAttackDamageBonus() { return material.baseAttackDamage(); } - @Override + public int getUses() { return material.toolDurability(); } + public float getSpeed() { return material.toolEfficiency(); } + public float getAttackDamageBonus() { return material.baseAttackDamage(); } public net.minecraft.tags.TagKey getIncorrectBlocksForDrops() { return switch (material.toolLevel()) { case 0 -> net.minecraft.tags.BlockTags.INCORRECT_FOR_WOODEN_TOOL; @@ -39,6 +45,6 @@ public net.minecraft.tags.TagKey getIncor default -> net.minecraft.tags.BlockTags.INCORRECT_FOR_DIAMOND_TOOL; }; } - @Override public int getEnchantmentValue() { return material.enchantability(); } - @Override public Ingredient getRepairIngredient() { return repair.get(); } + public int getEnchantmentValue() { return material.enchantability(); } + public Ingredient getRepairIngredient() { return repair.get(); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MetalFluidType.java b/src/main/java/zone/moddev/mc/basemetals/content/MetalFluidType.java index 5bf3f5b8b..bb4050a72 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MetalFluidType.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MetalFluidType.java @@ -2,28 +2,32 @@ import java.util.function.Consumer; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; import net.minecraftforge.fluids.FluidType; /** Shared molten-fluid rendering; Forge only requests these extensions on the client. */ public final class MetalFluidType extends FluidType { - private final ResourceLocation still; - private final ResourceLocation flowing; + private final Identifier still; + private final Identifier flowing; private final int colour; - public MetalFluidType(Properties properties, ResourceLocation still, ResourceLocation flowing, int colour) { + public MetalFluidType(Properties properties, Identifier still, Identifier flowing, int colour) { super(properties); this.still = still; this.flowing = flowing; this.colour = 0xFF000000 | colour; } + public int colour() { + return colour; + } + @Override public void initializeClient(Consumer consumer) { consumer.accept(new IClientFluidTypeExtensions() { - @Override public ResourceLocation getStillTexture() { return still; } - @Override public ResourceLocation getFlowingTexture() { return flowing; } + @Override public Identifier getStillTexture() { return still; } + @Override public Identifier getFlowingTexture() { return flowing; } @Override public int getTintColor() { return colour; } }); } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java index e278e0cd4..07d7ea582 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; +import java.util.function.Function; import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.ModTabs; @@ -34,10 +35,10 @@ import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.level.material.Fluid; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.level.block.SoundType; -import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.fluids.FluidType; import net.minecraftforge.common.SoundActions; import net.minecraftforge.fluids.ForgeFlowingFluid; @@ -76,8 +77,8 @@ public final class ModContent { registerAnvil("steel_anvil", metalProperties(MaterialCatalogue.get("steel"))); registerAnvil("adamantine_anvil", metalProperties(MaterialCatalogue.get("adamantine"))); HUMAN_DETECTOR = registerBlock("human_detector", - () -> new HumanDetectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL) - .sound(SoundType.METAL).strength(5.0F).noCollission()), true); + () -> new HumanDetectorBlock(BlockBehaviour.Properties.of().setId(BLOCKS.key("human_detector")).mapColor(MapColor.METAL) + .sound(SoundType.METAL).strength(5.0F).noCollision()), true); registerVanillaBits(); MaterialCatalogue.ALL.forEach(material -> registerFluid(material.name(), material.colour(), material.name().equals("mercury"))); @@ -91,8 +92,16 @@ public final class ModContent { private ModContent() {} - public static void register(IEventBus bus) { - MaterialArmor.register(bus); + private static final class MaterialProperties extends Item.Properties { + @Override + public Item.Properties enchantable(int value) { + // Zero means un-enchantable in the material catalogue. The native + // component accepts only positive values, so leave it absent. + return value > 0 ? super.enchantable(value) : this; + } + } + + public static void register(BusGroup bus) { BLOCKS.register(bus); ITEMS.register(bus); FLUIDS.register(bus); @@ -137,12 +146,12 @@ private static void registerMaterial(MaterialDefinition material) { } String doubleSlab = "double_" + material.name() + "_slab"; blocks.put("double_slab", registerBlock(doubleSlab, - () -> new CompatibilityDoubleSlabBlock(metalProperties(material)), false)); + () -> new CompatibilityDoubleSlabBlock(metalProperties(material).setId(BLOCKS.key(doubleSlab))), false)); HIDDEN_BLOCKS.add(doubleSlab); } if (material.hasOre()) { String id = material.name() + "_ore"; - blocks.put("ore", registerBlock(id, () -> new Block(oreProperties(material)), true)); + blocks.put("ore", registerBlock(id, () -> new Block(oreProperties(material).setId(BLOCKS.key(id))), true)); items.put("ore", ITEMS_BY_ID.get(id)); if (!material.name().equals("copper")) { items.put("raw", registerSimpleMaterialItem(material.name() + "_raw", material)); @@ -179,19 +188,20 @@ private static RegistryObject registerMaterialBlock(String id, String for private static RegistryObject registerMaterialBlock(String id, String form, MaterialDefinition material, boolean item, Supplier properties, Supplier stairBase) { + Supplier keyedProperties = () -> properties.get().setId(BLOCKS.key(id)); Supplier factory = switch (form) { - case "plate" -> () -> new PlateBlock(properties.get().noOcclusion()); - case "bars" -> () -> new IronBarsBlock(properties.get().noOcclusion().dynamicShape()); - case "door" -> () -> new DoorBlock(doorType(material), properties.get().noOcclusion().dynamicShape()); - case "trapdoor" -> () -> new TrapDoorBlock(doorType(material), properties.get().noOcclusion().dynamicShape()); - case "button" -> () -> new ButtonBlock(BlockSetType.STONE, 20, properties.get().noCollission()); - case "slab" -> () -> new SlabBlock(properties.get()); - case "lever" -> () -> new LeverBlock(properties.get().noCollission()); + case "plate" -> () -> new PlateBlock(keyedProperties.get().noOcclusion()); + case "bars" -> () -> new IronBarsBlock(keyedProperties.get().noOcclusion().dynamicShape()); + case "door" -> () -> new DoorBlock(doorType(material), keyedProperties.get().noOcclusion().dynamicShape()); + case "trapdoor" -> () -> new TrapDoorBlock(doorType(material), keyedProperties.get().noOcclusion().dynamicShape()); + case "button" -> () -> new ButtonBlock(BlockSetType.STONE, 20, keyedProperties.get().noCollision()); + case "slab" -> () -> new SlabBlock(keyedProperties.get()); + case "lever" -> () -> new LeverBlock(keyedProperties.get().noCollision()); case "pressure_plate" -> () -> new PressurePlateBlock( - BlockSetType.STONE, properties.get()); - case "stairs" -> () -> new StairBlock(stairBase.get(), properties.get()); - case "wall" -> () -> new WallBlock(properties.get()); - default -> () -> new Block(properties.get()); + BlockSetType.STONE, keyedProperties.get()); + case "stairs" -> () -> new StairBlock(stairBase.get(), keyedProperties.get()); + case "wall" -> () -> new WallBlock(keyedProperties.get()); + default -> () -> new Block(keyedProperties.get()); }; return registerBlock(id, factory, item); } @@ -201,41 +211,39 @@ private static BlockSetType doorType(MaterialDefinition material) { } private static void registerEquipment(MaterialDefinition material, Map> items) { - Item.Properties tool = new Item.Properties().durability(material.toolDurability()); - Item.Properties combat = new Item.Properties(); - items.put("pickaxe", registerItem(material.name() + "_pickaxe", () -> new MaterialItems.Pickaxe(material, tool))); - items.put("axe", registerItem(material.name() + "_axe", () -> new MaterialItems.Axe(material, - new Item.Properties()))); - items.put("shovel", registerItem(material.name() + "_shovel", () -> new MaterialItems.Shovel(material, - new Item.Properties()))); - items.put("hoe", registerItem(material.name() + "_hoe", () -> new MaterialItems.Hoe(material, - new Item.Properties()))); - items.put("sword", registerItem(material.name() + "_sword", () -> new MaterialItems.Sword(material, - new Item.Properties()))); - items.put("crackhammer", registerItem(material.name() + "_crackhammer", () -> new CrackhammerItem(material, - new Item.Properties()))); - items.put("scythe", registerItem(material.name() + "_scythe", () -> new ScytheItem(material, - new Item.Properties()))); - items.put("shears", registerItem(material.name() + "_shears", () -> new MaterialItems.Shears(material, - new Item.Properties().durability(material.toolDurability())))); - items.put("fishing_rod", registerItem(material.name() + "_fishing_rod", () -> new MaterialItems.FishingRod(material, - new Item.Properties().durability(material.toolDurability())))); - items.put("bow", registerItem(material.name() + "_bow", () -> new MaterialItems.Bow(material, - combat.durability(material.toolDurability())))); - items.put("crossbow", registerItem(material.name() + "_crossbow", () -> new MaterialItems.Crossbow(material, - new Item.Properties().durability(material.toolDurability())))); - items.put("shield", registerItem(material.name() + "_shield", () -> new MaterialItems.Shield(material, - new Item.Properties().durability(material.shieldDurability())))); - items.put("arrow", registerItem(material.name() + "_arrow", () -> new BaseMetalAmmoItem(material, + items.put("pickaxe", registerItem(material.name() + "_pickaxe", itemProperties -> new MaterialItems.Pickaxe(material, itemProperties))); + items.put("axe", registerItem(material.name() + "_axe", itemProperties -> new MaterialItems.Axe(material, + itemProperties))); + items.put("shovel", registerItem(material.name() + "_shovel", itemProperties -> new MaterialItems.Shovel(material, + itemProperties))); + items.put("hoe", registerItem(material.name() + "_hoe", itemProperties -> new MaterialItems.Hoe(material, + itemProperties))); + items.put("sword", registerItem(material.name() + "_sword", itemProperties -> new MaterialItems.Sword(material, + itemProperties))); + items.put("crackhammer", registerItem(material.name() + "_crackhammer", itemProperties -> new CrackhammerItem(material, + itemProperties))); + items.put("scythe", registerItem(material.name() + "_scythe", itemProperties -> new ScytheItem(material, + itemProperties))); + items.put("shears", registerItem(material.name() + "_shears", itemProperties -> new MaterialItems.Shears(material, + itemProperties.durability(material.toolDurability())))); + items.put("fishing_rod", registerItem(material.name() + "_fishing_rod", itemProperties -> new MaterialItems.FishingRod(material, + itemProperties.durability(material.toolDurability())))); + items.put("bow", registerItem(material.name() + "_bow", itemProperties -> new MaterialItems.Bow(material, + itemProperties.durability(material.toolDurability())))); + items.put("crossbow", registerItem(material.name() + "_crossbow", itemProperties -> new MaterialItems.Crossbow(material, + itemProperties.durability(material.toolDurability())))); + items.put("shield", registerItem(material.name() + "_shield", itemProperties -> new MaterialItems.Shield(material, + itemProperties.durability(material.shieldDurability())))); + items.put("arrow", registerItem(material.name() + "_arrow", itemProperties -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.ARROW, ModEntities.CUSTOM_ARROW::get, - new Item.Properties()))); - items.put("bolt", registerItem(material.name() + "_bolt", () -> new BaseMetalAmmoItem(material, + itemProperties))); + items.put("bolt", registerItem(material.name() + "_bolt", itemProperties -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.BOLT, ModEntities.CUSTOM_BOLT::get, - new Item.Properties()))); + itemProperties))); items.put("rod", registerSimpleMaterialItem(material.name() + "_rod", material)); items.put("gear", registerSimpleMaterialItem(material.name() + "_gear", material)); items.put("horse_armor", registerItem(material.name() + "_horse_armor", - () -> new MaterialItems.HorseArmor(material, new Item.Properties().stacksTo(1)))); + itemProperties -> new MaterialItems.HorseArmor(material, itemProperties.stacksTo(1)))); items.put("helmet", registerArmor(material, EquipmentSlot.HEAD)); items.put("chestplate", registerArmor(material, EquipmentSlot.CHEST)); items.put("leggings", registerArmor(material, EquipmentSlot.LEGS)); @@ -250,17 +258,17 @@ private static RegistryObject registerArmor(MaterialDefinition material, E case FEET -> "boots"; default -> throw new IllegalArgumentException("Not armor: " + slot); }; - return registerItem(id, () -> new MaterialItems.Armor(material, slot, - new Item.Properties())); + return registerItem(id, itemProperties -> new MaterialItems.Armor(material, slot, + itemProperties)); } private static void registerVanillaBits() { Map vanilla = vanillaDefinitions(); RegistryObject charcoalBlock = registerBlock("charcoal_block", - () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE) + () -> new Block(BlockBehaviour.Properties.of().setId(BLOCKS.key("charcoal_block")).mapColor(MapColor.STONE) .sound(SoundType.SAND).requiresCorrectToolForDrops().strength(5.0F)), false); - registerItem("charcoal_block", () -> new MaterialItems.BurnableBlock( - charcoalBlock.get(), 16000, new Item.Properties())); + registerItem("charcoal_block", itemProperties -> new MaterialItems.BurnableBlock( + charcoalBlock.get(), 16000, itemProperties)); registerVanillaDecorative("diamond", vanilla.get("diamond"), List.of("bars", "door", "trapdoor", "button", "slab", "lever", "pressure_plate", "stairs", "wall")); registerVanillaDecorative("emerald", vanilla.get("emerald"), @@ -273,19 +281,19 @@ private static void registerVanillaBits() { List.of("button", "slab", "lever", "stairs", "wall")); registerVanillaDecorative("quartz", vanilla.get("quartz"), List.of("bars", "door", "trapdoor", "button", "lever", "pressure_plate", "wall")); - registerBlock("gold_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.GOLD_BLOCK).noOcclusion()), true); - registerBlock("iron_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.IRON_BLOCK).noOcclusion()), true); + registerBlock("gold_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.GOLD_BLOCK).setId(BLOCKS.key("gold_plate")).noOcclusion()), true); + registerBlock("iron_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.IRON_BLOCK).setId(BLOCKS.key("iron_plate")).noOcclusion()), true); for (String name : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { registerVanillaCombatAndUtility(vanilla.get(name)); } for (String name : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz", "stone", "wood")) { MaterialDefinition material = vanilla.get(name); - registerItem(name + "_crackhammer", () -> new CrackhammerItem(material, - new Item.Properties())); + registerItem(name + "_crackhammer", itemProperties -> new CrackhammerItem(material, + itemProperties)); registerSimpleMaterialItem(name + "_gear", material); - registerItem(name + "_scythe", () -> new ScytheItem(material, - new Item.Properties())); + registerItem(name + "_scythe", itemProperties -> new ScytheItem(material, + itemProperties)); } for (String name : List.of("coal", "charcoal", "diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { MaterialDefinition material = vanilla.get(name); @@ -316,7 +324,7 @@ private static void registerVanillaDecorative(String name, MaterialDefinition ma if (forms.contains("slab")) { String id = "double_" + name + "_slab"; registerBlock(id, () -> new CompatibilityDoubleSlabBlock( - vanillaDecorativeProperties(name, "slab", material)), false); + vanillaDecorativeProperties(name, "slab", material).setId(BLOCKS.key(id))), false); HIDDEN_BLOCKS.add(id); } } @@ -349,40 +357,40 @@ private static Block vanillaStorageBlock(String name) { private static void registerVanillaCombatAndUtility(MaterialDefinition material) { String name = material.name(); - registerItem(name + "_arrow", () -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.ARROW, - ModEntities.CUSTOM_ARROW::get, new Item.Properties())); - registerItem(name + "_bolt", () -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.BOLT, - ModEntities.CUSTOM_BOLT::get, new Item.Properties())); - registerItem(name + "_bow", () -> new MaterialItems.Bow(material, - new Item.Properties().durability(material.toolDurability()))); - registerItem(name + "_crossbow", () -> new MaterialItems.Crossbow(material, - new Item.Properties().durability(material.toolDurability()))); - registerItem(name + "_fishing_rod", () -> new MaterialItems.FishingRod(material, - new Item.Properties().durability(material.toolDurability()))); + registerItem(name + "_arrow", itemProperties -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.ARROW, + ModEntities.CUSTOM_ARROW::get, itemProperties)); + registerItem(name + "_bolt", itemProperties -> new BaseMetalAmmoItem(material, BaseMetalAmmoItem.Kind.BOLT, + ModEntities.CUSTOM_BOLT::get, itemProperties)); + registerItem(name + "_bow", itemProperties -> new MaterialItems.Bow(material, + itemProperties.durability(material.toolDurability()))); + registerItem(name + "_crossbow", itemProperties -> new MaterialItems.Crossbow(material, + itemProperties.durability(material.toolDurability()))); + registerItem(name + "_fishing_rod", itemProperties -> new MaterialItems.FishingRod(material, + itemProperties.durability(material.toolDurability()))); registerSimpleMaterialItem(name + "_rod", material); if (!name.equals("iron")) { - registerItem(name + "_shears", () -> new MaterialItems.Shears(material, - new Item.Properties().durability(material.toolDurability()))); + registerItem(name + "_shears", itemProperties -> new MaterialItems.Shears(material, + itemProperties.durability(material.toolDurability()))); } - registerItem(name + "_shield", () -> new MaterialItems.Shield(material, - new Item.Properties().durability(material.shieldDurability()))); + registerItem(name + "_shield", itemProperties -> new MaterialItems.Shield(material, + itemProperties.durability(material.shieldDurability()))); // Preserve IDs which were added for vanilla materials by MMDLib. The // vanilla equipment itself remains the canonical tool/armor where present. if (name.equals("emerald") || name.equals("obsidian") || name.equals("quartz")) { - registerItem(name + "_axe", () -> new MaterialItems.Axe(material, new Item.Properties())); - registerItem(name + "_pickaxe", () -> new MaterialItems.Pickaxe(material, new Item.Properties())); - registerItem(name + "_shovel", () -> new MaterialItems.Shovel(material, new Item.Properties())); - registerItem(name + "_hoe", () -> new MaterialItems.Hoe(material, new Item.Properties())); + registerItem(name + "_axe", itemProperties -> new MaterialItems.Axe(material, itemProperties)); + registerItem(name + "_pickaxe", itemProperties -> new MaterialItems.Pickaxe(material, itemProperties)); + registerItem(name + "_shovel", itemProperties -> new MaterialItems.Shovel(material, itemProperties)); + registerItem(name + "_hoe", itemProperties -> new MaterialItems.Hoe(material, itemProperties)); registerArmor(material, EquipmentSlot.HEAD); registerArmor(material, EquipmentSlot.CHEST); registerArmor(material, EquipmentSlot.LEGS); registerArmor(material, EquipmentSlot.FEET); - registerItem(name + "_horse_armor", () -> new MaterialItems.HorseArmor(material, - new Item.Properties().stacksTo(1))); + registerItem(name + "_horse_armor", itemProperties -> new MaterialItems.HorseArmor(material, + itemProperties.stacksTo(1))); } if (name.equals("emerald") || name.equals("obsidian") || name.equals("quartz")) { - registerItem(name + "_sword", () -> new MaterialItems.Sword(material, - new Item.Properties())); + registerItem(name + "_sword", itemProperties -> new MaterialItems.Sword(material, + itemProperties)); } } @@ -415,9 +423,9 @@ private static void registerFluid(String name, int colour, boolean mercury) { RegistryObject[] flowing = new RegistryObject[1]; RegistryObject[] block = new RegistryObject[1]; RegistryObject[] bucket = new RegistryObject[1]; - ResourceLocation still = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, + Identifier still = Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, mercury ? "block/mercury_still" : "block/molten_metal_still"); - ResourceLocation flow = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, + Identifier flow = Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, mercury ? "block/mercury_flow" : "block/molten_metal_flow"); RegistryObject type = FLUID_TYPES.register(name, () -> new MetalFluidType( FluidType.Properties.create().density(mercury ? 13594 : 2000) @@ -436,19 +444,19 @@ private static void registerFluid(String name, int colour, boolean mercury) { source[0] = FLUIDS.register(name, () -> new ForgeFlowingFluid.Source(properties)); flowing[0] = FLUIDS.register("flowing_" + name, () -> new ForgeFlowingFluid.Flowing(properties)); block[0] = BLOCKS.register(name, () -> new MoltenMetalBlock(() -> source[0].get(), - BlockBehaviour.Properties.of().mapColor(MapColor.FIRE).liquid().replaceable() - .pushReaction(PushReaction.DESTROY).noCollission().strength(100.0F).noLootTable(), mercury)); + BlockBehaviour.Properties.of().setId(BLOCKS.key(name)).mapColor(MapColor.FIRE).liquid().replaceable() + .pushReaction(PushReaction.DESTROY).noCollision().strength(100.0F).noLootTable(), mercury)); BLOCKS_BY_ID.put(name, block[0]); // Forge 1.12 registered an ItemBlock under every molten block ID. Keep // those hidden inventory IDs so old stacks can survive a world upgrade. - registerItem(name, () -> new BlockItem(block[0].get(), new Item.Properties())); - bucket[0] = registerItem(name + "_bucket", () -> new BaseMetalBucketItem(() -> source[0].get(), - new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); + registerItem(name, itemProperties -> new BlockItem(block[0].get(), itemProperties)); + bucket[0] = registerItem(name + "_bucket", itemProperties -> new BaseMetalBucketItem(() -> source[0].get(), + itemProperties.craftRemainder(Items.BUCKET).stacksTo(1))); FLUID_CONTENT.put(name, new FluidContent(source[0], flowing[0], block[0], bucket[0])); } private static RegistryObject registerAnvil(String id, BlockBehaviour.Properties properties) { - return registerBlock(id, () -> new BaseMetalAnvilBlock(properties), true); + return registerBlock(id, () -> new BaseMetalAnvilBlock(properties.setId(BLOCKS.key(id))), true); } private static RegistryObject registerBlock(String id, Supplier factory, boolean hasItem) { @@ -456,14 +464,14 @@ private static RegistryObject registerBlock(String id, Supplier block = BLOCKS.register(id, factory); BLOCKS_BY_ID.put(id, block); if (hasItem) { - registerItem(id, () -> new BlockItem(block.get(), new Item.Properties())); + registerItem(id, itemProperties -> new BlockItem(block.get(), itemProperties)); } return block; } private static RegistryObject registerSimpleMaterialItem(String id, MaterialDefinition material) { - return registerItem(id, () -> new MaterialItems.Basic(material, burnTime(id), - new Item.Properties())); + return registerItem(id, itemProperties -> new MaterialItems.Basic(material, burnTime(id), + itemProperties)); } private static int burnTime(String id) { @@ -481,9 +489,10 @@ private static boolean isLegacyFuelMaterial(String name) { return false; } - private static RegistryObject registerItem(String id, Supplier factory) { + private static RegistryObject registerItem(String id, Function factory) { if (ITEMS_BY_ID.containsKey(id)) throw new IllegalStateException("Duplicate item " + id); - RegistryObject item = ITEMS.register(id, factory); + RegistryObject item = ITEMS.register(id, + () -> factory.apply(new MaterialProperties().setId(ITEMS.key(id)))); ITEMS_BY_ID.put(id, item); return item; } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java index 6988b83a3..58c4b3d61 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MoltenMetalBlock.java @@ -23,11 +23,12 @@ public MoltenMetalBlock(Supplier fluid, Properties prope } @Override - public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) { - super.entityInside(state, level, pos, entity); - if (mercury && !level.isClientSide && BaseMetalsConfig.MERCURY_EFFECTS.get() + public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity, + net.minecraft.world.entity.InsideBlockEffectApplier effects, boolean intersects) { + super.entityInside(state, level, pos, entity, effects, intersects); + if (mercury && !level.isClientSide() && BaseMetalsConfig.MERCURY_EFFECTS.get() && entity instanceof LivingEntity living && level.random.nextInt(32) == 0) { - living.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 30 * 20, 2)); + living.addEffect(new MobEffectInstance(MobEffects.NAUSEA, 30 * 20, 2)); } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java index 2c85a7171..39689be49 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/PlateBlock.java @@ -10,14 +10,14 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.Vec3; import net.minecraft.util.Mth; public final class PlateBlock extends Block { - public static final DirectionProperty FACING = BlockStateProperties.FACING; + public static final EnumProperty FACING = BlockStateProperties.FACING; private static final VoxelShape[] SHAPES = { box(0, 15, 0, 16, 16, 16), box(0, 0, 0, 16, 1, 16), box(0, 0, 15, 16, 16, 16), box(0, 0, 0, 16, 16, 1), diff --git a/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java b/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java index b07f421a1..40b49308c 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java @@ -4,7 +4,9 @@ import zone.moddev.mc.basemetals.ModTags; import net.minecraft.core.BlockPos; -import net.minecraft.world.item.DiggerItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.component.TooltipDisplay; +import java.util.function.Consumer; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.network.chat.Component; @@ -14,7 +16,7 @@ import java.util.List; import javax.annotation.Nullable; -public final class ScytheItem extends DiggerItem implements MaterialBacked { +public final class ScytheItem extends Item implements MaterialBacked { /** * The nested calls use the ordinary server break path so every affected * block still fires Forge's protection event and receives vanilla drops. @@ -25,8 +27,8 @@ public final class ScytheItem extends DiggerItem implements MaterialBacked { private final MaterialDefinition material; public ScytheItem(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), ModTags.SCYTHE_HARVESTABLE, - properties.attributes(DiggerItem.createAttributes(new MaterialTier(material), 0.0F, 0.0F))); + super(properties.tool(new MaterialTier(material).toolMaterial(), + ModTags.SCYTHE_HARVESTABLE, 0.0F, 0.0F, 0.0F)); this.material = material; } @@ -34,7 +36,7 @@ public ScytheItem(MaterialDefinition material, Properties properties) { @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos position, Player player) { - if (player.level().isClientSide || !(player instanceof ServerPlayer serverPlayer) + if (player.level().isClientSide() || !(player instanceof ServerPlayer serverPlayer) || HARVESTING.get()) { return false; } @@ -62,7 +64,7 @@ public boolean onBlockStartBreak(ItemStack stack, BlockPos position, Player play @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, - List tooltip, TooltipFlag flag) { + TooltipDisplay display, Consumer tooltip, TooltipFlag flag) { MaterialItems.addToolTooltip(material, tooltip); } } 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 5769d56ea..54c2a01c1 100644 --- a/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java +++ b/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java @@ -7,7 +7,7 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.projectile.AbstractArrow; +import net.minecraft.world.entity.projectile.arrow.AbstractArrow; import net.minecraft.world.entity.projectile.ItemSupplier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -53,27 +53,44 @@ public ItemStack getItem() { } @Override - public void addAdditionalSaveData(CompoundTag tag) { + public void addAdditionalSaveData(net.minecraft.world.level.storage.ValueOutput tag) { super.addAdditionalSaveData(tag); - if (!ammunition.isEmpty()) tag.put("Ammunition", ammunition.save(registryAccess())); + if (!ammunition.isEmpty()) tag.store("Ammunition", ItemStack.CODEC, ammunition); } @Override - public void readAdditionalSaveData(CompoundTag tag) { + public void readAdditionalSaveData(net.minecraft.world.level.storage.ValueInput tag) { super.readAdditionalSaveData(tag); - CompoundTag saved = tag.getCompound("Ammunition"); + CompoundTag saved = tag.read("Ammunition", CompoundTag.CODEC).orElseGet(CompoundTag::new); if (saved.contains("Count")) { saved = (CompoundTag) net.minecraft.util.datafix.DataFixers.getDataFixer().update( net.minecraft.util.datafix.fixes.References.ITEM_STACK, new com.mojang.serialization.Dynamic<>(net.minecraft.nbt.NbtOps.INSTANCE, saved), - 3465, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()).getValue(); + 3465, net.minecraft.SharedConstants.getCurrentVersion().dataVersion().version()).getValue(); } - ammunition = ItemStack.parseOptional(registryAccess(), saved); + ammunition = decodeAmmunition(saved); if (!ammunition.isEmpty()) setPickupItemStack(ammunition); } - @Override public void writeSpawnData(FriendlyByteBuf buffer) { buffer.writeNbt((CompoundTag) ammunition.saveOptional(registryAccess())); } - @Override public void readSpawnData(FriendlyByteBuf additionalData) { ammunition = ItemStack.parseOptional(registryAccess(), additionalData.readNbt()); } + private ItemStack decodeAmmunition(CompoundTag saved) { + if (saved == null || saved.isEmpty()) return ItemStack.EMPTY; + + return ItemStack.CODEC.parse(registryAccess().createSerializationContext( + net.minecraft.nbt.NbtOps.INSTANCE), saved).getOrThrow(); + } + + @Override + public void writeSpawnData(FriendlyByteBuf buffer) { + buffer.writeNbt(ammunition.isEmpty() ? new CompoundTag() + : (CompoundTag) ItemStack.CODEC.encodeStart(registryAccess().createSerializationContext( + net.minecraft.nbt.NbtOps.INSTANCE), ammunition).getOrThrow()); + } + + @Override + public void readSpawnData(FriendlyByteBuf buffer) { + ammunition = decodeAmmunition(buffer.readNbt()); + if (!ammunition.isEmpty()) setPickupItemStack(ammunition); + } /** * AbstractArrow's vanilla packet omits Forge additional spawn data. The diff --git a/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java b/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java index 6631905e0..6c739e6a0 100644 --- a/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java +++ b/src/main/java/zone/moddev/mc/basemetals/entity/ModEntities.java @@ -4,7 +4,7 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; -import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -15,12 +15,12 @@ public final class ModEntities { public static final RegistryObject> CUSTOM_ARROW = ENTITIES.register( "custom_arrow", () -> EntityType.Builder.of(MaterialProjectile::new, MobCategory.MISC) .sized(0.5F, 0.5F).clientTrackingRange(4).updateInterval(20) - .build(BaseMetals.MOD_ID + ":custom_arrow")); + .build(ENTITIES.key("custom_arrow"))); public static final RegistryObject> CUSTOM_BOLT = ENTITIES.register( "custom_bolt", () -> EntityType.Builder.of(MaterialProjectile::new, MobCategory.MISC) .sized(0.5F, 0.5F).clientTrackingRange(4).updateInterval(20) - .build(BaseMetals.MOD_ID + ":custom_bolt")); + .build(ENTITIES.key("custom_bolt"))); private ModEntities() {} - public static void register(IEventBus bus) { ENTITIES.register(bus); } + public static void register(BusGroup bus) { ENTITIES.register(bus); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/loot/AppendLootTableModifier.java b/src/main/java/zone/moddev/mc/basemetals/loot/AppendLootTableModifier.java index 72776f2da..da4e0058a 100644 --- a/src/main/java/zone/moddev/mc/basemetals/loot/AppendLootTableModifier.java +++ b/src/main/java/zone/moddev/mc/basemetals/loot/AppendLootTableModifier.java @@ -4,7 +4,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; @@ -13,18 +13,19 @@ public final class AppendLootTableModifier extends LootModifier { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> - codecStart(instance).and(ResourceLocation.CODEC.fieldOf("table").forGetter(modifier -> modifier.table)) + codecStart(instance).and(Identifier.CODEC.fieldOf("table").forGetter(modifier -> modifier.table)) .apply(instance, AppendLootTableModifier::new)); - private final ResourceLocation table; + private final Identifier table; - public AppendLootTableModifier(LootItemCondition[] conditions, ResourceLocation table) { + public AppendLootTableModifier(LootItemCondition[] conditions, Identifier table) { super(conditions); this.table = table; } @Override - protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { - context.getResolver().get(net.minecraft.core.registries.Registries.LOOT_TABLE, net.minecraft.resources.ResourceKey.create( + protected ObjectArrayList doApply(net.minecraft.world.level.storage.loot.LootTable source, + ObjectArrayList generatedLoot, LootContext context) { + context.getResolver().get(net.minecraft.resources.ResourceKey.create( net.minecraft.core.registries.Registries.LOOT_TABLE, table)).orElseThrow().value().getRandomItemsRaw(context, item -> { if (zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(item.getItem()).toString())) { generatedLoot.add(item); diff --git a/src/main/java/zone/moddev/mc/basemetals/loot/ModLoot.java b/src/main/java/zone/moddev/mc/basemetals/loot/ModLoot.java index e082288c3..6ebe77b2e 100644 --- a/src/main/java/zone/moddev/mc/basemetals/loot/ModLoot.java +++ b/src/main/java/zone/moddev/mc/basemetals/loot/ModLoot.java @@ -4,7 +4,7 @@ import com.mojang.serialization.MapCodec; import net.minecraftforge.common.loot.IGlobalLootModifier; -import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -16,5 +16,5 @@ public final class ModLoot { SERIALIZERS.register("add_table", () -> AppendLootTableModifier.CODEC); private ModLoot() {} - public static void register(IEventBus bus) { SERIALIZERS.register(bus); } + public static void register(BusGroup bus) { SERIALIZERS.register(bus); } } 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 feaf84490..09f26f0c6 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java @@ -42,7 +42,7 @@ import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.Tag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.util.datafix.DataFixers; @@ -97,16 +97,16 @@ static void beginWorldLoad() { static void prepareWorld(Path levelDat, CompoundTag root) { if (!isLegacyLevel(root)) return; - CompoundTag data = root.getCompound("Data"); + CompoundTag data = root.getCompoundOrEmpty("Data"); preparedWorld = levelDat.toAbsolutePath().normalize().getParent(); - preparedVersion = data.getInt("DataVersion"); - preparedPlayer = data.contains("Player", Tag.TAG_COMPOUND) ? data.getCompound("Player").copy() : null; + preparedVersion = data.getIntOr("DataVersion", 0); + preparedPlayer = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(data, "Player", Tag.TAG_COMPOUND) ? data.getCompoundOrEmpty("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; + CompoundTag data = root.getCompoundOrEmpty("Data"); + return zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(data, "DataVersion", 99) + && data.getIntOr("DataVersion", 0) <= LAST_SUPPORTED_LEGACY_DATA_VERSION; } private static boolean hasLegacySource(Path root) throws IOException { @@ -193,22 +193,22 @@ public static void refreshLoadedSingleplayerPlayer(MinecraftServer server, Path CompoundTag loaded = server.getWorldData().getLoadedPlayerTag(); if (loaded == null) return; CompoundTag level = LegacyNbt.readCompressed(worldRoot.resolve("level.dat").toFile()); - CompoundTag data = level.getCompound("Data"); - if (!data.contains("Player", Tag.TAG_COMPOUND)) return; - int version = data.getInt("DataVersion"); + CompoundTag data = level.getCompoundOrEmpty("Data"); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(data, "Player", Tag.TAG_COMPOUND)) return; + int version = data.getIntOr("DataVersion", 0); CompoundTag corrected = DataFixTypes.PLAYER.updateToCurrentVersion(DataFixers.getDataFixer(), - data.getCompound("Player"), version); - for (String key : List.copyOf(loaded.getAllKeys())) loaded.remove(key); + data.getCompoundOrEmpty("Player"), version); + for (String key : List.copyOf(loaded.keySet())) loaded.remove(key); loaded.merge(corrected); } private static Map oldBlockIds(CompoundTag level) { - CompoundTag registries = level.getCompound("FML").getCompound("Registries"); - ListTag ids = registries.getCompound("minecraft:blocks").getList("ids", Tag.TAG_COMPOUND); + CompoundTag registries = level.getCompoundOrEmpty("FML").getCompoundOrEmpty("Registries"); + ListTag ids = registries.getCompoundOrEmpty("minecraft:blocks").getListOrEmpty("ids"); Map result = new LinkedHashMap<>(); for (Tag value : ids) { CompoundTag entry = (CompoundTag) value; - result.put(entry.getInt("V"), entry.getString("K")); + result.put(entry.getIntOr("V", 0), entry.getStringOr("K", "")); } return result; } @@ -218,7 +218,7 @@ private static Map legacyBlockIds(Path root) throws IOException Path file = root.resolve(fileName); if (!Files.isRegularFile(file)) continue; CompoundTag candidate = LegacyNbt.readCompressed(file.toFile()); - int dataVersion = candidate.getCompound("Data").getInt("DataVersion"); + int dataVersion = candidate.getCompoundOrEmpty("Data").getIntOr("DataVersion", 0); if (dataVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION && !fileName.equals("basemetals-legacy-registry.dat")) continue; Map ids = oldBlockIds(candidate); @@ -357,19 +357,19 @@ record = Arrays.copyOfRange(source, position, position + 4 + length); } private static ChunkConversion convertChunk(CompoundTag chunk, Map ids) throws IOException { - int sourceVersion = chunk.getInt("DataVersion"); + int sourceVersion = chunk.getIntOr("DataVersion", 0); if (sourceVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION) { return new ChunkConversion(false, 0, 0, 0, 0, 0, chunk); } ItemMigration itemMigration = convertLegacyItems(chunk); - CompoundTag level = chunk.getCompound("Level"); - ListTag sections = level.getList("Sections", Tag.TAG_COMPOUND); + CompoundTag level = chunk.getCompoundOrEmpty("Level"); + ListTag sections = level.getListOrEmpty("Sections"); List savedBlocks = new ArrayList<>(); int externalStates = 0; for (Tag value : sections) { CompoundTag section = (CompoundTag) value; - if (!section.contains("Blocks", Tag.TAG_BYTE_ARRAY)) continue; + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(section, "Blocks", Tag.TAG_BYTE_ARRAY)) continue; SectionSnapshot snapshot = snapshotSection(section, ids); savedBlocks.addAll(snapshot.blocks()); externalStates += snapshot.externalStates(); @@ -433,9 +433,9 @@ private static ItemMigration restoreRewrittenSingleplayerPlayer(Path root) throw } CompoundTag current = LegacyNbt.readCompressed(currentFile.toFile()); - CompoundTag currentData = current.getCompound("Data"); - if (currentData.getInt("DataVersion") <= LAST_SUPPORTED_LEGACY_DATA_VERSION - || !currentData.contains("Player", Tag.TAG_COMPOUND)) { + CompoundTag currentData = current.getCompoundOrEmpty("Data"); + if (currentData.getIntOr("DataVersion", 0) <= LAST_SUPPORTED_LEGACY_DATA_VERSION + || !zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(currentData, "Player", Tag.TAG_COMPOUND)) { return ItemMigration.NONE; } @@ -457,10 +457,10 @@ private static ItemMigration convertLegacyItems(Tag value) { int convertedItemAliases = 0; int convertedDamageValues = 0; if (value instanceof CompoundTag compound) { - if (compound.getString("id").equalsIgnoreCase("forge:bucketfilled") - && compound.contains("tag", Tag.TAG_COMPOUND)) { - CompoundTag itemTag = compound.getCompound("tag"); - String fluid = itemTag.getString("FluidName"); + if (compound.getStringOr("id", "").equalsIgnoreCase("forge:bucketfilled") + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "tag", Tag.TAG_COMPOUND)) { + CompoundTag itemTag = compound.getCompoundOrEmpty("tag"); + String fluid = itemTag.getStringOr("FluidName", ""); String target = MissingMappings.fluidTargetPath(fluid); if (ModContent.fluids().containsKey(target)) { compound.putString("id", BaseMetals.MOD_ID + ":" + target + "_bucket"); @@ -470,22 +470,22 @@ private static ItemMigration convertLegacyItems(Tag value) { convertedBuckets++; } } else { - ResourceLocation oldId = ResourceLocation.tryParse(compound.getString("id")); + Identifier oldId = Identifier.tryParse(compound.getStringOr("id", "")); if (oldId != null && (oldId.getNamespace().equals(BaseMetals.MOD_ID) || oldId.getNamespace().equals("mmdlib")) - && compound.contains("Count", Tag.TAG_ANY_NUMERIC)) { - ResourceLocation targetId = MissingMappings.itemTargetId(oldId.getPath()); + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "Count", 99)) { + Identifier targetId = MissingMappings.itemTargetId(oldId.getPath()); net.minecraft.world.item.Item item = ForgeRegistries.ITEMS.getValue(targetId); if (item != null && !oldId.equals(targetId)) { compound.putString("id", targetId.toString()); convertedItemAliases++; } - int damage = compound.getInt("Damage"); + int damage = compound.getIntOr("Damage", 0); if (item != null && item.getDefaultInstance().isDamageableItem() && damage > 0 - && compound.contains("Damage", Tag.TAG_ANY_NUMERIC)) { - CompoundTag itemTag = compound.contains("tag", Tag.TAG_COMPOUND) - ? compound.getCompound("tag") : new CompoundTag(); - if (!itemTag.contains("Damage", Tag.TAG_ANY_NUMERIC)) { + && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "Damage", 99)) { + CompoundTag itemTag = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "tag", Tag.TAG_COMPOUND) + ? compound.getCompoundOrEmpty("tag") : new CompoundTag(); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(itemTag, "Damage", 99)) { itemTag.putInt("Damage", damage); compound.put("tag", itemTag); convertedDamageValues++; @@ -493,7 +493,7 @@ private static ItemMigration convertLegacyItems(Tag value) { } } } - for (String key : List.copyOf(compound.getAllKeys())) { + for (String key : List.copyOf(compound.keySet())) { Tag child = compound.get(key); if (child != null) { ItemMigration childMigration = convertLegacyItems(child); @@ -524,11 +524,11 @@ private static void writeCompressedAtomically(Path file, CompoundTag data) throw } static CompoundTag stateAtForTest(CompoundTag chunk, int sectionY, int index) throws IOException { - ListTag sections = chunk.getCompound("Level").getList("Sections", Tag.TAG_COMPOUND); + ListTag sections = chunk.getCompoundOrEmpty("Level").getListOrEmpty("Sections"); for (Tag value : sections) { CompoundTag section = (CompoundTag) value; - if (section.getByte("Y") != sectionY) continue; - ListTag palette = section.getList("Palette", Tag.TAG_COMPOUND); + if (section.getByteOr("Y", (byte) 0) != sectionY) continue; + ListTag palette = section.getListOrEmpty("Palette"); int[] values = unpackBlockStates(section, palette.size()); return ((CompoundTag) palette.get(values[index])).copy(); } @@ -537,10 +537,10 @@ static CompoundTag stateAtForTest(CompoundTag chunk, int sectionY, int index) th private static SectionSnapshot snapshotSection(CompoundTag section, Map ids) throws IOException { - byte[] blocks = section.getByteArray("Blocks"); - byte[] metadata = section.getByteArray("Data"); - byte[] add = section.contains("Add", Tag.TAG_BYTE_ARRAY) ? section.getByteArray("Add") : null; - int sectionY = section.getByte("Y"); + byte[] blocks = section.getByteArray("Blocks").orElseGet(() -> new byte[0]); + byte[] metadata = section.getByteArray("Data").orElseGet(() -> new byte[0]); + byte[] add = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(section, "Add", Tag.TAG_BYTE_ARRAY) ? section.getByteArray("Add").orElseGet(() -> new byte[0]) : null; + int sectionY = section.getByteOr("Y", (byte) 0); List savedBlocks = new ArrayList<>(); int externalStates = 0; @@ -562,10 +562,10 @@ private static SectionSnapshot snapshotSection(CompoundTag section, Map savedBlocks) throws IOException { Map targetSections = new HashMap<>(); - ListTag sections = chunk.getCompound("Level").getList("Sections", Tag.TAG_COMPOUND); + ListTag sections = chunk.getCompoundOrEmpty("Level").getListOrEmpty("Sections"); for (Tag value : sections) { CompoundTag section = (CompoundTag) value; - targetSections.put((int) section.getByte("Y"), section); + targetSections.put((int) section.getByteOr("Y", (byte) 0), section); } Map byPosition = new HashMap<>(); @@ -580,7 +580,7 @@ private static void restoreSavedBlocks(CompoundTag chunk, List save if (section == null) { throw new IOException("Mojang's flattening data fix removed legacy section Y=" + entry.getKey()); } - ListTag palette = section.getList("Palette", Tag.TAG_COMPOUND); + ListTag palette = section.getListOrEmpty("Palette"); if (palette.isEmpty()) { throw new IOException("Mojang's flattening data fix produced an empty palette at section Y=" + entry.getKey()); @@ -612,7 +612,7 @@ private static Map> snapshotLegacyBlockEntities( for (LegacyBlock block : savedBlocks) savedPositions.add(block.positionKey()); Map> result = new LinkedHashMap<>(); - for (Tag value : level.getList("TileEntities", Tag.TAG_COMPOUND)) { + for (Tag value : level.getListOrEmpty("TileEntities")) { CompoundTag blockEntity = (CompoundTag) value; long position = localPositionKey(blockEntity); if (!savedPositions.contains(position)) continue; @@ -626,9 +626,9 @@ private static void restoreLegacyBlockEntities(CompoundTag chunk, List savedPositions = new HashSet<>(); for (LegacyBlock block : savedBlocks) savedPositions.add(block.positionKey()); - CompoundTag level = chunk.getCompound("Level"); + CompoundTag level = chunk.getCompoundOrEmpty("Level"); ListTag restored = new ListTag(); - for (Tag value : level.getList("TileEntities", Tag.TAG_COMPOUND)) { + for (Tag value : level.getListOrEmpty("TileEntities")) { CompoundTag blockEntity = (CompoundTag) value; if (!savedPositions.contains(localPositionKey(blockEntity))) restored.add(blockEntity.copy()); } @@ -639,13 +639,13 @@ private static void restoreLegacyBlockEntities(CompoundTag chunk, List new long[0]); if (packed.length == 0 && paletteSize == 1) return values; int bits = bitsForPalette(paletteSize); int requiredLongs = (int) Math.ceil(values.length * (double) bits / 64.0D); @@ -689,11 +689,11 @@ private static int bitsForPalette(int paletteSize) { private static CompoundTag restoredState(LegacyBlock legacy, Map byPosition) throws IOException { String normalizedName = normalizeLegacyRegistryName(legacy.name()); - ResourceLocation oldId = ResourceLocation.tryParse(normalizedName); + Identifier oldId = Identifier.tryParse(normalizedName); if (oldId == null) throw new IOException("Invalid legacy block registry name " + legacy.name()); if (oldId.getNamespace().equals(BaseMetals.MOD_ID) || oldId.getNamespace().equals("mmdlib")) { String path = MissingMappings.blockTargetPath(oldId.getPath()); - ResourceLocation targetId = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, path); + Identifier targetId = Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, path); Block block = ForgeRegistries.BLOCKS.getValue(targetId); if (block == null) throw new IOException("No 1.18 block exists for legacy block " + legacy.name()); BlockState state = stateForLegacyMetadata(block, legacy.metadata()); @@ -721,7 +721,7 @@ private static CompoundTag restoredState(LegacyBlock legacy, Map Codec acceptLegacyPayload(Codec current) { + Codec legacy = CompoundTag.CODEC.validate(payload -> { + for (String key : payload.keySet()) { + Identifier id = Identifier.tryParse(key); + + // Capability owners have namespaced IDs. A broken current wrapper is not an old payload. + if (id == null || !id.toString().equals(key)) { + return DataResult.error(() -> "Not a legacy world-capability payload"); + } + } + + return DataResult.success(payload); + }); + + return Codec.withAlternative(current, legacy, payload -> { + CompoundTag wrapper = new CompoundTag(); + wrapper.put("data", payload.copy()); + return current.parse(NbtOps.INSTANCE, wrapper).getOrThrow(); + }); + } +} 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 dd65498e6..288cb02d7 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java @@ -64,7 +64,7 @@ import net.minecraft.world.level.block.state.properties.SlabType; import net.minecraft.world.level.block.state.properties.StairsShape; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.datafix.fixes.BlockStateData; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; import net.minecraftforge.registries.ForgeRegistries; @@ -75,10 +75,10 @@ * durability data before Minecraft reads the items. */ public final class LegacyWorldDataHook { - private static final ResourceLocation BLOCK_REGISTRY = ResourceLocation.fromNamespaceAndPath("minecraft", "blocks"); + private static final Identifier BLOCK_REGISTRY = Identifier.fromNamespaceAndPath("minecraft", "blocks"); private static final Map LEGACY_WORLD_DATA = new ConcurrentHashMap(); private static final BitSet LEGACY_BASE_METALS_BLOCK_IDS = new BitSet(); - private static volatile Map legacyTerrainChunks = Collections.emptyMap(); + private static volatile Map legacyTerrainChunks = Collections.emptyMap(); private static final Map LEGACY_BASE_METALS_BLOCK_COUNTS = new ConcurrentHashMap(); private static final Map VANILLA_BLOCK_ENTITY_IDS = vanillaBlockEntityIds(); @@ -88,7 +88,7 @@ public final class LegacyWorldDataHook { private LegacyWorldDataHook() {} - /** Called by the coremod before Forge reads level.dat. */ + /** Captures the current level.dat before vanilla converts it. */ public static synchronized void prepareLegacyWorld(File levelDat) { Legacy112WorldMigrator.beginWorldLoad(); legacyWorldActive = false; @@ -99,12 +99,12 @@ public static synchronized void prepareLegacyWorld(File levelDat) { if (source == null) return; try (FileInputStream input = new FileInputStream(source)) { CompoundTag root = LegacyNbt.readCompressed(input); - if (root.getCompound("Data").getInt("DataVersion") < 2834) { + if (root.getCompoundOrEmpty("Data").getIntOr("DataVersion", 0) < 2834) { legacyWorldActive = true; indexLegacyChunks(levelDat.getParentFile()); } - if (root.contains("FML", 10)) { - prepareLegacyData(levelDat.getParentFile(), root.getCompound("FML")); + if (zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(root, "FML", 10)) { + prepareLegacyData(levelDat.getParentFile(), root.getCompoundOrEmpty("FML")); } migrateLoosePlayerData(levelDat, root); } catch (IOException exception) { @@ -132,8 +132,8 @@ private static void prepareLevelMetadata(File levelDat) { } 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; + CompoundTag data = root.getCompoundOrEmpty("Data"); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(data, "DataVersion", 99) || data.getIntOr("DataVersion", 0) >= 2834) return; Path sidecar = levelDat.toPath().resolveSibling(REGISTRY_SIDECAR); if (Files.exists(sidecar)) return; @@ -142,9 +142,9 @@ private static void preserveLegacySource(File levelDat, CompoundTag root) throws // 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")); + source.putInt("DataVersion", data.getIntOr("DataVersion", 0)); saved.put("Data", source); - if (root.contains("FML", Tag.TAG_COMPOUND)) saved.put("FML", root.getCompound("FML").copy()); + if (zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(root, "FML", Tag.TAG_COMPOUND)) saved.put("FML", root.getCompoundOrEmpty("FML").copy()); try (java.io.OutputStream output = Files.newOutputStream(sidecar, StandardOpenOption.CREATE_NEW)) { LegacyNbt.writeCompressed(saved, output); @@ -154,27 +154,27 @@ private static void preserveLegacySource(File levelDat, CompoundTag root) throws static boolean removeRetiredVanillaProfessionRegistry(CompoundTag root) { boolean changed = false; for (String namespace : new String[] {"fml", "FML"}) { - CompoundTag registries = root.getCompound(namespace).getCompound("Registries"); + CompoundTag registries = root.getCompoundOrEmpty(namespace).getCompoundOrEmpty("Registries"); String key = "minecraft:villagerprofessions"; - if (!registries.contains(key, 10)) continue; - CompoundTag snapshot = registries.getCompound(key); - if (!snapshot.contains("ids", 9)) continue; + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(registries, key, 10)) continue; + CompoundTag snapshot = registries.getCompoundOrEmpty(key); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(snapshot, "ids", 9)) continue; boolean vanillaOnly = true; for (Tag entry : (ListTag) snapshot.get("ids")) { if (!(entry instanceof CompoundTag)) { vanillaOnly = false; continue; } - String name = ((CompoundTag) entry).getString("K"); + String name = ((CompoundTag) entry).getStringOr("K", ""); if (!Arrays.asList("minecraft:farmer", "minecraft:librarian", "minecraft:priest", "minecraft:smith", "minecraft:butcher", "minecraft:nitwit").contains(name)) { vanillaOnly = false; } } for (String list : new String[] {"aliases", "overrides", "dummied"}) { - if (snapshot.contains(list, 9) && !((ListTag) snapshot.get(list)).isEmpty()) vanillaOnly = false; + if (zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(snapshot, list, 9) && !((ListTag) snapshot.get(list)).isEmpty()) vanillaOnly = false; } - if (snapshot.getIntArray("blocked").length > 0) vanillaOnly = false; + if (snapshot.getIntArray("blocked").orElseGet(() -> new int[0]).length > 0) vanillaOnly = false; if (!vanillaOnly) continue; // Vanilla converts the villagers themselves. This retired Forge registry @@ -206,15 +206,15 @@ static boolean removeObsoleteVanillaBiomeSnapshot(CompoundTag root) { + "windswept_forest windswept_gravelly_hills windswept_hills windswept_savanna wooded_badlands").split(" ")); boolean changed = false; for (String namespace : new String[] {"fml", "FML"}) { - CompoundTag registries = root.getCompound(namespace).getCompound("Registries"); + CompoundTag registries = root.getCompoundOrEmpty(namespace).getCompoundOrEmpty("Registries"); String key = "minecraft:worldgen/biome"; - if (!registries.contains(key, 10)) continue; - CompoundTag snapshot = registries.getCompound(key); - if (!snapshot.contains("ids", 9) || snapshot.getIntArray("blocked").length != 0) continue; + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(registries, key, 10)) continue; + CompoundTag snapshot = registries.getCompoundOrEmpty(key); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(snapshot, "ids", 9) || snapshot.getIntArray("blocked").orElseGet(() -> new int[0]).length != 0) continue; boolean vanillaOnly = true; for (Tag entry : (ListTag) snapshot.get("ids")) { if (!(entry instanceof CompoundTag id)) { vanillaOnly = false; break; } - String name = id.getString("K"); + String name = id.getStringOr("K", ""); if (!name.startsWith("minecraft:") || !known.contains(name.substring("minecraft:".length()))) { vanillaOnly = false; break; @@ -233,23 +233,23 @@ static boolean removeObsoleteVanillaBiomeSnapshot(CompoundTag root) { } static boolean migrateRemovedVanillaBiomeSources(CompoundTag root) { - CompoundTag data = root.getCompound("Data"); - if (data.getInt("DataVersion") >= 2834) return false; + CompoundTag data = root.getCompoundOrEmpty("Data"); + if (data.getIntOr("DataVersion", 0) >= 2834) return false; - CompoundTag dimensions = data.getCompound("WorldGenSettings").getCompound("dimensions"); + CompoundTag dimensions = data.getCompoundOrEmpty("WorldGenSettings").getCompoundOrEmpty("dimensions"); boolean changed = false; - for (String id : dimensions.getAllKeys()) { + for (String id : dimensions.keySet()) { // Minecraft handles the main Overworld itself, but skips custom dimensions. if ("minecraft:overworld".equals(id)) continue; - CompoundTag generator = dimensions.getCompound(id).getCompound("generator"); - CompoundTag source = generator.getCompound("biome_source"); - if (!"minecraft:noise".equals(generator.getString("type")) - || !"minecraft:vanilla_layered".equals(source.getString("type"))) continue; + CompoundTag generator = dimensions.getCompoundOrEmpty(id).getCompoundOrEmpty("generator"); + CompoundTag source = generator.getCompoundOrEmpty("biome_source"); + if (!"minecraft:noise".equals(generator.getStringOr("type", "")) + || !"minecraft:vanilla_layered".equals(source.getStringOr("type", ""))) continue; // Use Minecraft's 1.18 replacement for this removed vanilla biome source. // Modded biome sources and noise settings stay untouched. - if (source.getBoolean("large_biomes") && "minecraft:overworld".equals(generator.getString("settings"))) { + if (source.getBooleanOr("large_biomes", false) && "minecraft:overworld".equals(generator.getStringOr("settings", ""))) { generator.putString("settings", "minecraft:large_biomes"); } CompoundTag replacement = new CompoundTag(); @@ -266,11 +266,11 @@ public static synchronized void prepareLegacyChunk(CompoundTag root) { if (root == null) return; migrateLegacyItems(root); migrateWallStates(root); - if (!legacyWorldActive || !root.contains("Level", 10)) return; - CompoundTag level = root.getCompound("Level"); + if (!legacyWorldActive || !zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(root, "Level", 10)) return; + CompoundTag level = root.getCompoundOrEmpty("Level"); int legacyBlocks = countLegacyBaseMetalsBlocks(level); if (legacyBlocks > 0) { - LEGACY_BASE_METALS_BLOCK_COUNTS.put(Long.valueOf(chunkKey(level.getInt("xPos"), level.getInt("zPos"))), + LEGACY_BASE_METALS_BLOCK_COUNTS.put(Long.valueOf(chunkKey(level.getIntOr("xPos", 0), level.getIntOr("zPos", 0))), Integer.valueOf(legacyBlocks)); } // Chests or entities may contain the only Base Metals items in this chunk. @@ -285,18 +285,18 @@ static int migrateWallStates(Tag value) { int changed = 0; if (value instanceof CompoundTag) { CompoundTag compound = (CompoundTag) value; - String name = compound.getString("Name"); + String name = compound.getStringOr("Name", ""); if (name.startsWith("basemetals:") && name.endsWith("_wall")) { - CompoundTag properties = compound.getCompound("Properties"); + CompoundTag properties = compound.getCompoundOrEmpty("Properties"); for (String direction : new String[] {"north", "east", "south", "west"}) { - String connection = properties.getString(direction); + String connection = properties.getStringOr(direction, ""); if ("true".equals(connection) || "false".equals(connection)) { properties.putString(direction, "true".equals(connection) ? "low" : "none"); changed++; } } } - for (String key : compound.getAllKeys()) changed += migrateWallStates(compound.get(key)); + for (String key : compound.keySet()) changed += migrateWallStates(compound.get(key)); } else if (value instanceof ListTag) { for (Tag entry : (ListTag) value) changed += migrateWallStates(entry); } @@ -306,11 +306,11 @@ static int migrateWallStates(Tag value) { /** Called after vanilla datafixing, before a legacy chunk is returned. */ public static CompoundTag finalizeLegacyChunk(CompoundTag root) { if (root != null) { - CompoundTag level = root.contains("Level", 10) ? root.getCompound("Level") : root; - if (level.getBoolean(PRESERVE_CHUNK_MARKER)) { + CompoundTag level = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(root, "Level", 10) ? root.getCompoundOrEmpty("Level") : root; + if (level.getBooleanOr(PRESERVE_CHUNK_MARKER, false)) { removePhantomBedEntities(level); // Keep vanilla's below-zero retrogen status so 1.18 can fill the new underground. - if (!level.contains("below_zero_retrogen", 10)) level.putString("Status", "full"); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(level, "below_zero_retrogen", 10)) level.putString("Status", "full"); level.remove(PRESERVE_CHUNK_MARKER); } } @@ -318,16 +318,16 @@ public static CompoundTag finalizeLegacyChunk(CompoundTag root) { } static int removePhantomBedEntities(CompoundTag level) { - ListTag entities = level.getList(level.contains("block_entities", 9) ? "block_entities" : "TileEntities", 10); + ListTag entities = level.getListOrEmpty(NbtCompat.containsTag(level, "block_entities", 9) ? "block_entities" : "TileEntities"); int removed = 0; for (int index = entities.size() - 1; index >= 0; index--) { - CompoundTag entity = entities.getCompound(index); - if (!"minecraft:bed".equals(entity.getString("id"))) continue; + CompoundTag entity = entities.getCompoundOrEmpty(index); + if (!"minecraft:bed".equals(entity.getStringOr("id", ""))) continue; // Vanilla's pre-flattening bed fixer ignores the high bits of modded block IDs. // A bed entity cannot belong to a Base Metals block; real beds are left alone. - String block = paletteBlockAt(level, entity.getInt("x"), entity.getInt("y"), entity.getInt("z")); + String block = paletteBlockAt(level, entity.getIntOr("x", 0), entity.getIntOr("y", 0), entity.getIntOr("z", 0)); if (block.startsWith("basemetals:")) { entities.remove(index); removed++; @@ -338,25 +338,25 @@ static int removePhantomBedEntities(CompoundTag level) { } private static String paletteBlockAt(CompoundTag level, int x, int y, int z) { - for (Tag entry : level.getList(level.contains("sections", 9) ? "sections" : "Sections", 10)) { + for (Tag entry : level.getListOrEmpty(NbtCompat.containsTag(level, "sections", 9) ? "sections" : "Sections")) { CompoundTag section = (CompoundTag) entry; - if (section.getByte("Y") != (y >> 4)) continue; + if (section.getByteOr("Y", (byte) 0) != (y >> 4)) continue; - CompoundTag statesTag = section.getCompound("block_states"); - boolean modern = section.contains("block_states", 10); - ListTag palette = modern ? statesTag.getList("palette", 10) : section.getList("Palette", 10); + CompoundTag statesTag = section.getCompoundOrEmpty("block_states"); + boolean modern = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(section, "block_states", 10); + ListTag palette = modern ? statesTag.getListOrEmpty("palette") : section.getListOrEmpty("Palette"); if (palette.isEmpty()) return ""; int state = 0; if (palette.size() > 1) { int bits = Math.max(4, 32 - Integer.numberOfLeadingZeros(palette.size() - 1)); int perWord = 64 / bits; int position = ((y & 15) << 8) | ((z & 15) << 4) | (x & 15); - long[] states = modern ? statesTag.getLongArray("data") : section.getLongArray("BlockStates"); + long[] states = modern ? statesTag.getLongArray("data").orElseGet(() -> new long[0]) : section.getLongArray("BlockStates").orElseGet(() -> new long[0]); int word = position / perWord; if (word >= states.length) return ""; state = (int) ((states[word] >>> ((position % perWord) * bits)) & ((1L << bits) - 1)); } - return state < palette.size() ? palette.getCompound(state).getString("Name") : ""; + return state < palette.size() ? palette.getCompoundOrEmpty(state).getStringOr("Name", "") : ""; } return ""; } @@ -364,10 +364,10 @@ private static String paletteBlockAt(CompoundTag level, int x, int y, int z) { public static boolean shouldBlockWorldgenWrite(net.minecraft.server.level.WorldGenRegion region, net.minecraft.core.BlockPos position) { return legacyWorldActive && position != null - && isProtectedChunk(region.getLevel().dimension().location(), position); + && isProtectedChunk(region.getLevel().dimension().identifier(), position); } - static boolean isProtectedChunk(ResourceLocation dimension, net.minecraft.core.BlockPos position) { + static boolean isProtectedChunk(Identifier dimension, net.minecraft.core.BlockPos position) { LongSet chunks = legacyTerrainChunks.get(dimension); // Pre-1.18 worlds have saved terrain at Y=0..255. New negative-Y terrain is not protected. return position.getY() >= 0 && position.getY() < 256 && chunks != null @@ -375,12 +375,12 @@ static boolean isProtectedChunk(ResourceLocation dimension, net.minecraft.core.B } private static synchronized void prepareLegacyData(File worldDirectory, CompoundTag tag) { - if (!tag.contains("Registries", 10)) return; - CompoundTag registries = tag.getCompound("Registries"); - if (!registries.contains(BLOCK_REGISTRY.toString(), 10)) return; + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(tag, "Registries", 10)) return; + CompoundTag registries = tag.getCompoundOrEmpty("Registries"); + if (!NbtCompat.containsTag(registries, BLOCK_REGISTRY.toString(), 10)) return; String key = worldKey(worldDirectory); boolean first = !LEGACY_WORLD_DATA.containsKey(key); - int states = installLegacyBlockStates(registries.getCompound(BLOCK_REGISTRY.toString())); + int states = installLegacyBlockStates(registries.getCompoundOrEmpty(BLOCK_REGISTRY.toString())); if (first) LEGACY_WORLD_DATA.put(key, tag.copy()); legacyWorldActive |= states > 0; File sidecar = new File(worldDirectory, REGISTRY_SIDECAR); @@ -402,18 +402,18 @@ private static synchronized void prepareLegacyData(File worldDirectory, Compound private static int installLegacyBlockStates(CompoundTag snapshot) { LEGACY_BASE_METALS_BLOCK_IDS.clear(); - Map ids = new LinkedHashMap(); - ListTag savedIds = snapshot.getList("ids", 10); + Map ids = new LinkedHashMap(); + ListTag savedIds = snapshot.getListOrEmpty("ids"); int highestState = 0; for (int index = 0; index < savedIds.size(); index++) { - CompoundTag entry = savedIds.getCompound(index); - String normalized = normalizeLegacyRegistryName(entry.getString("K")); + CompoundTag entry = savedIds.getCompoundOrEmpty(index); + String normalized = normalizeLegacyRegistryName(entry.getStringOr("K", "")); int separator = normalized.indexOf(':'); if (separator < 0) continue; String namespace = normalized.substring(0, separator); if (!BaseMetals.MOD_ID.equals(namespace) && !"mmdlib".equals(namespace)) continue; - ResourceLocation id = ResourceLocation.parse(normalized); - int numeric = entry.getInt("V"); + Identifier id = Identifier.parse(normalized); + int numeric = entry.getIntOr("V", 0); ids.put(id, Integer.valueOf(numeric)); LEGACY_BASE_METALS_BLOCK_IDS.set(numeric); highestState = Math.max(highestState, (numeric << 4) | 15); @@ -421,21 +421,21 @@ private static int installLegacyBlockStates(CompoundTag snapshot) { if (ids.isEmpty()) return 0; Dynamic[] table = expandFlatteningTable(highestState + 1); int mapped = 0; - for (Map.Entry entry : ids.entrySet()) { + for (Map.Entry entry : ids.entrySet()) { Block block = resolveCurrentBlock(entry.getKey()); for (int meta = 0; meta < 16; meta++) { BlockState state = legacyState(block, entry.getKey().getPath(), meta); table[(entry.getValue().intValue() << 4) | meta] = - BlockStateData.parse(NbtUtils.writeBlockState(state).toString()); + new Dynamic<>(net.minecraft.nbt.NbtOps.INSTANCE, NbtUtils.writeBlockState(state)); mapped++; } } return mapped; } - private static Block resolveCurrentBlock(ResourceLocation oldId) { + private static Block resolveCurrentBlock(Identifier oldId) { String path = MissingMappings.blockTargetPath(oldId.getPath()); - Block block = ForgeRegistries.BLOCKS.getValue(ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, path)); + Block block = ForgeRegistries.BLOCKS.getValue(Identifier.fromNamespaceAndPath(BaseMetals.MOD_ID, path)); if (block == null) throw new IllegalStateException("No Base Metals replacement for legacy block " + oldId); return block; } @@ -536,11 +536,11 @@ static Map legacyBlockIdsForTest(java.nio.file.Path root) throw private static Map idsFromRoot(CompoundTag root) { Map result = new LinkedHashMap(); - ListTag ids = root.getCompound("FML").getCompound("Registries") - .getCompound(BLOCK_REGISTRY.toString()).getList("ids", 10); + ListTag ids = root.getCompoundOrEmpty("FML").getCompoundOrEmpty("Registries") + .getCompoundOrEmpty(BLOCK_REGISTRY.toString()).getListOrEmpty("ids"); for (int index = 0; index < ids.size(); index++) { - CompoundTag entry = ids.getCompound(index); - result.put(Integer.valueOf(entry.getInt("V")), normalizeLegacyRegistryName(entry.getString("K"))); + CompoundTag entry = ids.getCompoundOrEmpty(index); + result.put(Integer.valueOf(entry.getIntOr("V", 0)), normalizeLegacyRegistryName(entry.getStringOr("K", ""))); } return result; } @@ -585,16 +585,16 @@ private static int migrateLegacyItems(Tag value) { int changed = 0; if (value instanceof CompoundTag) { CompoundTag compound = (CompoundTag) value; - String id = compound.getString("id"); + String id = compound.getStringOr("id", ""); String vanillaBlockEntity = VANILLA_BLOCK_ENTITY_IDS.get(id); if (vanillaBlockEntity != null) { compound.putString("id", vanillaBlockEntity); id = vanillaBlockEntity; changed++; } - if ("forge:bucketfilled".equalsIgnoreCase(id) && compound.contains("tag", 10)) { - CompoundTag tag = compound.getCompound("tag"); - String target = MissingMappings.fluidTargetPath(tag.getString("FluidName")); + if ("forge:bucketfilled".equalsIgnoreCase(id) && zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "tag", 10)) { + CompoundTag tag = compound.getCompoundOrEmpty("tag"); + String target = MissingMappings.fluidTargetPath(tag.getStringOr("FluidName", "")); if (ModContent.fluids().containsKey(target)) { compound.putString("id", BaseMetals.MOD_ID + ":" + target + "_bucket"); tag.remove("FluidName"); @@ -602,27 +602,27 @@ private static int migrateLegacyItems(Tag value) { if (tag.isEmpty()) compound.remove("tag"); changed++; } - } else if (compound.contains("Count", 99)) { - ResourceLocation oldId = safeId(id); + } else if (zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "Count", 99)) { + Identifier oldId = safeId(id); if (oldId != null && (BaseMetals.MOD_ID.equals(oldId.getNamespace()) || "mmdlib".equals(oldId.getNamespace()))) { - ResourceLocation target = MissingMappings.itemTargetId(oldId.getPath()); + Identifier target = MissingMappings.itemTargetId(oldId.getPath()); if (!target.equals(oldId)) { compound.putString("id", target.toString()); changed++; } - if (compound.contains("Damage", 99) && compound.getInt("Damage") > 0) { - CompoundTag tag = compound.contains("tag", 10) - ? compound.getCompound("tag") : new CompoundTag(); - if (!tag.contains("Damage", 99)) { - tag.putInt("Damage", compound.getInt("Damage")); + if (zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "Damage", 99) && compound.getIntOr("Damage", 0) > 0) { + CompoundTag tag = zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(compound, "tag", 10) + ? compound.getCompoundOrEmpty("tag") : new CompoundTag(); + if (!zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(tag, "Damage", 99)) { + tag.putInt("Damage", compound.getIntOr("Damage", 0)); compound.put("tag", tag); changed++; } } } } - for (String key : new ArrayList(compound.getAllKeys())) { + for (String key : new ArrayList(compound.keySet())) { Tag child = compound.get(key); if (child != null) changed += migrateLegacyItems(child); } @@ -661,8 +661,8 @@ private static Map vanillaBlockEntityIds() { return Collections.unmodifiableMap(ids); } - private static ResourceLocation safeId(String value) { - try { return value == null || value.isEmpty() ? null : ResourceLocation.parse(value.toLowerCase(Locale.ROOT)); } + private static Identifier safeId(String value) { + try { return value == null || value.isEmpty() ? null : Identifier.parse(value.toLowerCase(Locale.ROOT)); } catch (RuntimeException ignored) { return null; } } @@ -686,9 +686,9 @@ private static File legacyRegistrySource(File levelDat) { if (!candidate.isFile()) continue; try (FileInputStream input = new FileInputStream(candidate)) { CompoundTag root = LegacyNbt.readCompressed(input); - if ((root.contains("FML", 10) && containsLegacyBaseMetalsRegistryEntry(root)) - || (root.getCompound("Data").contains("DataVersion", Tag.TAG_ANY_NUMERIC) - && root.getCompound("Data").getInt("DataVersion") < 2834)) return candidate; + if ((zone.moddev.mc.basemetals.migration.NbtCompat.containsTag(root, "FML", 10) && containsLegacyBaseMetalsRegistryEntry(root)) + || (NbtCompat.containsTag(root.getCompoundOrEmpty("Data"), "DataVersion", 99) + && root.getCompoundOrEmpty("Data").getIntOr("DataVersion", 0) < 2834)) return candidate; } catch (IOException ignored) {} } return null; @@ -705,12 +705,12 @@ private static boolean containsLegacyBaseMetalsRegistryEntry(CompoundTag root) { private static int countLegacyBaseMetalsBlocks(CompoundTag level) { int found = 0; - ListTag sections = level.getList("Sections", 10); + ListTag sections = level.getListOrEmpty("Sections"); for (int sectionIndex = 0; sectionIndex < sections.size(); sectionIndex++) { - CompoundTag section = sections.getCompound(sectionIndex); - byte[] blocks = section.getByteArray("Blocks"); + CompoundTag section = sections.getCompoundOrEmpty(sectionIndex); + byte[] blocks = section.getByteArray("Blocks").orElseGet(() -> new byte[0]); if (blocks.length != 4096) continue; - byte[] add = section.getByteArray("Add"); + byte[] add = section.getByteArray("Add").orElseGet(() -> new byte[0]); for (int index = 0; index < blocks.length; index++) { int high = add.length == 2048 ? (add[index >> 1] >> ((index & 1) * 4)) & 15 : 0; if (LEGACY_BASE_METALS_BLOCK_IDS.get((blocks[index] & 255) | (high << 8))) found++; @@ -725,10 +725,10 @@ public static Map legacyPreparedBlockCounts() { } static int indexLegacyChunks(File worldDirectory) { - Map indexed = new LinkedHashMap<>(); - indexRegionDirectory(indexed, ResourceLocation.parse("minecraft:overworld"), new File(worldDirectory, "region")); - indexRegionDirectory(indexed, ResourceLocation.parse("minecraft:the_nether"), new File(worldDirectory, "DIM-1/region")); - indexRegionDirectory(indexed, ResourceLocation.parse("minecraft:the_end"), new File(worldDirectory, "DIM1/region")); + Map indexed = new LinkedHashMap<>(); + indexRegionDirectory(indexed, Identifier.parse("minecraft:overworld"), new File(worldDirectory, "region")); + indexRegionDirectory(indexed, Identifier.parse("minecraft:the_nether"), new File(worldDirectory, "DIM-1/region")); + indexRegionDirectory(indexed, Identifier.parse("minecraft:the_end"), new File(worldDirectory, "DIM1/region")); Path dimensions = worldDirectory.toPath().resolve("dimensions"); if (Files.isDirectory(dimensions)) { @@ -739,7 +739,7 @@ static int indexLegacyChunks(File worldDirectory) { if (relative.getNameCount() < 2) return; String namespace = relative.getName(0).toString(); String name = relative.subpath(1, relative.getNameCount()).toString().replace(File.separatorChar, '/'); - indexRegionDirectory(indexed, ResourceLocation.fromNamespaceAndPath(namespace, name), path.toFile()); + indexRegionDirectory(indexed, Identifier.fromNamespaceAndPath(namespace, name), path.toFile()); }); } catch (IOException exception) { throw new IllegalStateException("Could not inspect saved dimensions in " + dimensions, exception); @@ -750,8 +750,8 @@ static int indexLegacyChunks(File worldDirectory) { return indexed.values().stream().mapToInt(LongSet::size).sum(); } - private static void indexRegionDirectory(Map indexed, - ResourceLocation dimension, File regionDirectory) { + private static void indexRegionDirectory(Map indexed, + Identifier dimension, File regionDirectory) { File[] regions = regionDirectory.listFiles((directory, name) -> name.matches("r\\.-?\\d+\\.-?\\d+\\.mc[ar]")); if (regions == null) return; LongSet chunks = indexed.computeIfAbsent(dimension, key -> new LongOpenHashSet()); diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/NbtCompat.java b/src/main/java/zone/moddev/mc/basemetals/migration/NbtCompat.java new file mode 100644 index 000000000..ecdaeb76b --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/migration/NbtCompat.java @@ -0,0 +1,15 @@ +package zone.moddev.mc.basemetals.migration; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NumericTag; +import net.minecraft.nbt.Tag; + +/** Type checks for saved data written before NBT's optional getters were introduced. */ +public final class NbtCompat { + private NbtCompat() {} + + public static boolean containsTag(CompoundTag compound, String key, int type) { + Tag value = compound.get(key); + return value != null && (type == 99 ? value instanceof NumericTag : value.getId() == type); + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilBlockMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilBlockMixin.java new file mode 100644 index 000000000..073a02edd --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilBlockMixin.java @@ -0,0 +1,22 @@ +package zone.moddev.mc.basemetals.mixin; + +import net.minecraft.world.level.block.AnvilBlock; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock; + +/** Advances the saved damage state without replacing a custom anvil with a vanilla one. */ +@Mixin(AnvilBlock.class) +abstract class AnvilBlockMixin { + @Inject(method = "damage", at = @At("HEAD"), cancellable = true) + private static void basemetals$damageAnvil(BlockState state, CallbackInfoReturnable callback) { + if (state.getBlock() instanceof BaseMetalAnvilBlock) { + int damage = state.getValue(BaseMetalAnvilBlock.DAMAGE); + callback.setReturnValue(damage < 2 + ? state.setValue(BaseMetalAnvilBlock.DAMAGE, damage + 1) : null); + } + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java new file mode 100644 index 000000000..b0a962fca --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/AnvilMenuMixin.java @@ -0,0 +1,23 @@ +package zone.moddev.mc.basemetals.mixin; + +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.inventory.AnvilMenu; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; +import zone.moddev.mc.basemetals.content.BaseMetalAnvilBlock; + +/** Includes custom anvils in the normal wear check without changing their falling behaviour. */ +@Mixin(AnvilMenu.class) +abstract class AnvilMenuMixin { + @Redirect( + method = "lambda$onTake$2(Lnet/minecraft/world/entity/player/Player;FLnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/tags/TagKey;)Z"), + require = 1, allow = 1) + private static boolean basemetals$includeCustomAnvil(BlockState state, TagKey tag) { + return state.is(tag) || tag == BlockTags.ANVIL && state.getBlock() instanceof BaseMetalAnvilBlock; + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/BlockStateDataMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/BlockStateDataMixin.java new file mode 100644 index 000000000..8d8a8bf4c --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/BlockStateDataMixin.java @@ -0,0 +1,29 @@ +package zone.moddev.mc.basemetals.mixin; + +import java.util.Arrays; + +import com.mojang.serialization.Dynamic; +import net.minecraft.util.datafix.fixes.BlockStateData; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** Makes room for the numeric block IDs used by old Forge saves. */ +@Mixin(BlockStateData.class) +abstract class BlockStateDataMixin { + @Shadow @Final @Mutable + private static Dynamic[] MAP; + + @Shadow @Final @Mutable + private static Dynamic[] BLOCK_DEFAULTS; + + @Inject(method = "", at = @At("TAIL")) + private static void basemetals$expandLegacyTables(CallbackInfo callback) { + MAP = Arrays.copyOf(MAP, Math.max(MAP.length, 65_536)); + BLOCK_DEFAULTS = Arrays.copyOf(BLOCK_DEFAULTS, Math.max(BLOCK_DEFAULTS.length, 4_096)); + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/LevelCapabilityDataMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/LevelCapabilityDataMixin.java new file mode 100644 index 000000000..113f1ed6c --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/LevelCapabilityDataMixin.java @@ -0,0 +1,22 @@ +package zone.moddev.mc.basemetals.mixin; + +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.saveddata.SavedDataType; +import net.minecraftforge.common.util.LevelCapabilityData; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import zone.moddev.mc.basemetals.migration.LegacyWorldCapabilityCodec; + +/** Forge 61 adds a wrapper that older world-capability files do not have. */ +@Mixin(value = LevelCapabilityData.class, remap = false) +abstract class LevelCapabilityDataMixin { + @Inject(method = "type", at = @At("RETURN"), cancellable = true, remap = false) + private static void basemetals$readOlderCapabilities(ServerLevel level, + CallbackInfoReturnable> callback) { + var current = callback.getReturnValue(); + callback.setReturnValue(new SavedDataType<>(current.id(), current.constructor(), + LegacyWorldCapabilityCodec.acceptLegacyPayload(current.codec()), current.dataFixType())); + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java new file mode 100644 index 000000000..59fbc8234 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java @@ -0,0 +1,25 @@ +package zone.moddev.mc.basemetals.mixin; + +import java.nio.file.Path; + +import com.mojang.datafixers.DataFixer; +import com.mojang.serialization.Dynamic; +import net.minecraft.world.level.storage.LevelStorageSource; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import zone.moddev.mc.basemetals.migration.LegacyWorldDataHook; + +/** Captures original registry and item data before vanilla runs its data fixers. */ +@Mixin(LevelStorageSource.class) +abstract class LevelStorageSourceMixin { + @Inject(method = "readLevelDataTagFixed", at = @At("HEAD")) + private static void basemetals$prepareWorld(Path file, DataFixer fixer, + CallbackInfoReturnable> callback) { + // A fallback backup must never make a modern world look like a legacy save. + if (file.getFileName().toString().equals("level.dat")) { + LegacyWorldDataHook.prepareLegacyWorld(file.toFile()); + } + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/OreSpawnEarlyTagCompatibilityMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/OreSpawnEarlyTagCompatibilityMixin.java new file mode 100644 index 000000000..8d9007352 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/OreSpawnEarlyTagCompatibilityMixin.java @@ -0,0 +1,37 @@ +package zone.moddev.mc.basemetals.mixin; + +import java.util.Collections; +import java.util.Set; + +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.registries.ForgeRegistries; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +/** Lets OreSpawn defer its early tag lookup until Minecraft has loaded the world's tags. */ +@Mixin(targets = "zone.moddev.mc.orespawn.worldgen.OreSpawnOreGeneration", remap = false) +abstract class OreSpawnEarlyTagCompatibilityMixin { + @Inject(method = "resolveTag", at = @At("HEAD"), cancellable = true, remap = false) + private static void basemetals$deferUnboundTags(TagKey tag, + CallbackInfoReturnable> callback) { + for (Block block : ForgeRegistries.BLOCKS.getValues()) { + try { + // Modded holders can still be unbound after vanilla's holders are ready. + block.defaultBlockState().is(tag); + } catch (IllegalStateException failure) { + if (!"Tags not bound".equals(failure.getMessage())) { + throw failure; + } + + // OreSpawn rebakes the unchanged profile once the world's tags are available. + callback.setReturnValue(Collections.emptySet()); + return; + } + } + + // Bound tags use OreSpawn's original resolver unchanged. + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java new file mode 100644 index 000000000..353f6b355 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/SimpleRegionStorageMixin.java @@ -0,0 +1,27 @@ +package zone.moddev.mc.basemetals.mixin; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.chunk.storage.SimpleRegionStorage; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import zone.moddev.mc.basemetals.migration.LegacyWorldDataHook; + +/** Restores legacy mod identities on either side of vanilla's chunk conversion. */ +@Mixin(SimpleRegionStorage.class) +abstract class SimpleRegionStorageMixin { + @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;", + at = @At("HEAD")) + private void basemetals$prepareChunk(CompoundTag chunk, int fallbackVersion, + CompoundTag context, CallbackInfoReturnable callback) { + LegacyWorldDataHook.prepareLegacyChunk(chunk); + } + + @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;", + at = @At("RETURN"), cancellable = true) + private void basemetals$finishChunk(CompoundTag chunk, int fallbackVersion, + CompoundTag context, CallbackInfoReturnable callback) { + callback.setReturnValue(LegacyWorldDataHook.finalizeLegacyChunk(callback.getReturnValue())); + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/mixin/WorldGenRegionMixin.java b/src/main/java/zone/moddev/mc/basemetals/mixin/WorldGenRegionMixin.java new file mode 100644 index 000000000..f08aaa208 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/mixin/WorldGenRegionMixin.java @@ -0,0 +1,20 @@ +package zone.moddev.mc.basemetals.mixin; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.WorldGenRegion; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import zone.moddev.mc.basemetals.migration.LegacyWorldDataHook; + +/** Protects imported terrain while allowing generation in genuinely new chunks. */ +@Mixin(WorldGenRegion.class) +abstract class WorldGenRegionMixin { + @Inject(method = "ensureCanWrite", at = @At("HEAD"), cancellable = true) + private void basemetals$protectTerrain(BlockPos position, CallbackInfoReturnable callback) { + if (LegacyWorldDataHook.shouldBlockWorldgenWrite((WorldGenRegion) (Object) this, position)) { + callback.setReturnValue(false); + } + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java b/src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java index aca65e0a8..55328b9bc 100644 --- a/src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java +++ b/src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java @@ -6,9 +6,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.server.network.ConfigurationTask; import net.minecraft.server.network.ServerConfigurationPacketListenerImpl; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.network.GatherLoginConfigurationTasksEvent; -import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.listener.Priority; import net.minecraftforge.network.ChannelBuilder; import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.SimpleChannel; @@ -54,7 +53,7 @@ public static void register() { context.setPacketHandled(true); }).add(); - MinecraftForge.EVENT_BUS.addListener(EventPriority.LOWEST, ContentModeNetwork::gatherTasks); + GatherLoginConfigurationTasksEvent.BUS.addListener(Priority.LOWEST, ContentModeNetwork::gatherTasks); } public static boolean modesMatch(String server, String client) { 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 a790ccd3d..c7ef46210 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java @@ -1,111 +1,108 @@ package zone.moddev.mc.basemetals.recipe; +import java.util.List; + import com.mojang.serialization.MapCodec; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.RegistryAccess; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; -import com.google.gson.JsonSyntaxException; -import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingBookCategory; +import net.minecraft.world.item.crafting.CraftingInput; +import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.item.crafting.PlacementInfo; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.RecipeManager; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraft.world.item.crafting.ShapedRecipe; -import net.minecraft.world.item.crafting.ShapelessRecipe; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.util.GsonHelper; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.crafting.display.RecipeDisplay; import net.minecraft.world.level.Level; +import net.minecraftforge.registries.ForgeRegistries; import zone.moddev.mc.basemetals.config.ContentPolicy; -/** Keeps recipe IDs stable between modes, including IDs stored in an old recipe book. */ -public final class ContentCraftingRecipe { - public static final RecipeSerializer> SERIALIZER = new Serializer(); - private ContentCraftingRecipe() {} +/** Keeps recipe IDs stable while hiding recipes that the selected mode does not allow. */ +public final class ContentCraftingRecipe implements CraftingRecipe { + public static final RecipeSerializer SERIALIZER = new Serializer(); + private final CraftingRecipe plain; - private static boolean allowed(Recipe recipe) { - return ContentPolicy.active().allows(ForgeRegistries.ITEMS.getKey(recipe.getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getItem()).toString()); + private ContentCraftingRecipe(CraftingRecipe plain) { + this.plain = plain; } - private static Recipe wrap(Recipe recipe) { - // Recipe-book placement needs the shaped recipe's width and height, not just its ingredients. - if (recipe instanceof ShapedRecipe) return new Shaped((ShapedRecipe) recipe); - if (recipe instanceof ShapelessRecipe) return new Shapeless((ShapelessRecipe) recipe); - throw new IllegalArgumentException("Not an ordinary crafting recipe: " + recipe.getSerializer()); + private boolean allowed() { + ItemStack result = plain.assemble(CraftingInput.EMPTY, RegistryAccess.EMPTY); + return ContentPolicy.active().allows(ForgeRegistries.ITEMS.getKey(result.getItem()).toString()); } - private static final class Shaped extends ShapedRecipe { - private final ShapedRecipe plain; - - private Shaped(ShapedRecipe plain) { - super(plain.getGroup(), plain.category(), - new net.minecraft.world.item.crafting.ShapedRecipePattern(plain.getWidth(), plain.getHeight(), - plain.getIngredients(), java.util.Optional.empty()), - plain.getResultItem(net.minecraft.core.RegistryAccess.EMPTY), plain.showNotification()); - this.plain = plain; - } - - @Override - public boolean matches(CraftingInput inventory, Level world) { - return allowed(this) && super.matches(inventory, world); + private static ContentCraftingRecipe wrap(Recipe recipe) { + if (!(recipe instanceof CraftingRecipe crafting)) { + throw new IllegalArgumentException("Expected a crafting recipe, got " + recipe.getSerializer()); } - @Override - public ItemStack assemble(CraftingInput inventory, net.minecraft.core.HolderLookup.Provider registries) { - return allowed(this) ? super.assemble(inventory, registries) : ItemStack.EMPTY; - } + return new ContentCraftingRecipe(crafting); + } - @Override - public boolean isSpecial() { - return !allowed(this); - } + @Override + public boolean matches(CraftingInput input, Level level) { + return allowed() && plain.matches(input, level); + } - @Override - public RecipeSerializer getSerializer() { - return SERIALIZER; - } + @Override + public ItemStack assemble(CraftingInput input, HolderLookup.Provider registries) { + return allowed() ? plain.assemble(input, registries) : ItemStack.EMPTY; } - private static final class Shapeless extends ShapelessRecipe { - private final ShapelessRecipe plain; + @Override + public boolean isSpecial() { + return !allowed() || plain.isSpecial(); + } - private Shapeless(ShapelessRecipe plain) { - super(plain.getGroup(), plain.category(), plain.getResultItem(net.minecraft.core.RegistryAccess.EMPTY), plain.getIngredients()); - this.plain = plain; - } + @Override + public String group() { + return plain.group(); + } - @Override - public boolean matches(CraftingInput inventory, Level world) { - return allowed(this) && super.matches(inventory, world); - } + @Override + public CraftingBookCategory category() { + return plain.category(); + } - @Override - public ItemStack assemble(CraftingInput inventory, net.minecraft.core.HolderLookup.Provider registries) { - return allowed(this) ? super.assemble(inventory, registries) : ItemStack.EMPTY; - } + @Override + public PlacementInfo placementInfo() { + return allowed() ? plain.placementInfo() : PlacementInfo.NOT_PLACEABLE; + } - @Override - public boolean isSpecial() { - return !allowed(this); - } + @Override + public List display() { + return allowed() ? plain.display() : List.of(); + } - @Override - public RecipeSerializer getSerializer() { - return SERIALIZER; - } + @Override + public boolean showNotification() { + return plain.showNotification(); } - private static Recipe plain(Recipe recipe) { - return recipe instanceof Shaped shaped ? shaped.plain : ((Shapeless) recipe).plain; + @Override + public RecipeSerializer getSerializer() { + return SERIALIZER; } - private static final class Serializer implements RecipeSerializer> { - private static final MapCodec> CODEC = Recipe.CODEC.fieldOf("recipe") - .xmap(ContentCraftingRecipe::wrap, ContentCraftingRecipe::plain); - private static final StreamCodec> STREAM_CODEC = - Recipe.STREAM_CODEC.map(ContentCraftingRecipe::wrap, ContentCraftingRecipe::plain); + private static final class Serializer implements RecipeSerializer { + private static final MapCodec CODEC = Recipe.CODEC.fieldOf("recipe") + .xmap(ContentCraftingRecipe::wrap, recipe -> recipe.plain); + // Preserve empty pattern slots and tag names instead of flattening the ingredients. + private static final StreamCodec STREAM_CODEC = + ByteBufCodecs.fromCodecWithRegistries(Recipe.CODEC) + .map(ContentCraftingRecipe::wrap, recipe -> recipe.plain); - @Override public MapCodec> codec() { return CODEC; } - @Override public StreamCodec> streamCodec() { return STREAM_CODEC; } + @Override + public MapCodec codec() { + return CODEC; + } + + @Override + public StreamCodec streamCodec() { + return STREAM_CODEC; + } } } 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 8be81699d..f877f8f72 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java @@ -9,7 +9,7 @@ import net.minecraft.core.NonNullList; import net.minecraft.core.Registry; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.GsonHelper; import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.item.ItemStack; @@ -35,7 +35,7 @@ public final class CrushingRecipe implements Recipe { SERIALIZERS.register("legacy_smelting", LegacySmeltingRecipe.Serializer::new); public static final RegistryObject> PLATE_REPAIR_SERIALIZER = SERIALIZERS.register("plate_repair", PlateRepairRecipe.Serializer::new); - public static final RegistryObject>> CONTENT_CRAFTING_SERIALIZER = + public static final RegistryObject> CONTENT_CRAFTING_SERIALIZER = SERIALIZERS.register("content_crafting", () -> ContentCraftingRecipe.SERIALIZER); private final Ingredient ingredient; @@ -55,12 +55,18 @@ public boolean matches(SingleRecipeInput input, Level level) { 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(); } - @Override public RecipeType getType() { return TYPE.get(); } - @Override public NonNullList getIngredients() { return NonNullList.of(Ingredient.EMPTY, ingredient); } + public boolean canCraftInDimensions(int width, int height) { return width * height >= 1; } + public ItemStack getResultItem(net.minecraft.core.HolderLookup.Provider registries) { return result.copy(); } + @Override public RecipeSerializer getSerializer() { return SERIALIZER.get(); } + @Override public RecipeType getType() { return TYPE.get(); } + public java.util.List getIngredients() { return java.util.List.of(ingredient); } @Override public boolean isSpecial() { return true; } + @Override public net.minecraft.world.item.crafting.PlacementInfo placementInfo() { + return net.minecraft.world.item.crafting.PlacementInfo.NOT_PLACEABLE; + } + @Override public net.minecraft.world.item.crafting.RecipeBookCategory recipeBookCategory() { + return net.minecraft.world.item.crafting.RecipeBookCategories.CRAFTING_MISC; + } private static final class CrushingRecipeType implements RecipeType { @Override @@ -72,7 +78,7 @@ public String toString() { public static final class Serializer implements RecipeSerializer { private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( - Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(recipe -> recipe.ingredient), + Ingredient.CODEC.fieldOf("ingredient").forGetter(recipe -> recipe.ingredient), ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.result)) .apply(instance, CrushingRecipe::new)); 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 2d4ab74ea..112d0d766 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java @@ -8,7 +8,7 @@ import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.GsonHelper; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; @@ -26,38 +26,40 @@ public LegacySmeltingRecipe(String group, Ingredient ingredient, @Override 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()) + return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(result().getItem()).toString()) && super.matches(inventory, world); } @Override 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()) + return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(result().getItem()).toString()) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } @Override - public RecipeSerializer getSerializer() { - return CrushingRecipe.LEGACY_SMELTING_SERIALIZER.get(); + @SuppressWarnings("unchecked") + public RecipeSerializer getSerializer() { + return (RecipeSerializer) (RecipeSerializer) + CrushingRecipe.LEGACY_SMELTING_SERIALIZER.get(); } public static final class Serializer implements RecipeSerializer { private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( - Codec.STRING.optionalFieldOf("group", "").forGetter(LegacySmeltingRecipe::getGroup), - Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(recipe -> recipe.getIngredients().getFirst()), - ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.getResultItem(null)), - Codec.FLOAT.optionalFieldOf("experience", 0.0F).forGetter(LegacySmeltingRecipe::getExperience), - Codec.INT.optionalFieldOf("cookingtime", 200).forGetter(LegacySmeltingRecipe::getCookingTime)) + Codec.STRING.optionalFieldOf("group", "").forGetter(LegacySmeltingRecipe::group), + Ingredient.CODEC.fieldOf("ingredient").forGetter(recipe -> recipe.input()), + ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.result()), + Codec.FLOAT.optionalFieldOf("experience", 0.0F).forGetter(LegacySmeltingRecipe::experience), + Codec.INT.optionalFieldOf("cookingtime", 200).forGetter(LegacySmeltingRecipe::cookingTime)) .apply(instance, LegacySmeltingRecipe::new)); private static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ByteBufCodecs.STRING_UTF8, LegacySmeltingRecipe::getGroup, - Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.getIngredients().getFirst(), - ItemStack.STREAM_CODEC, recipe -> recipe.getResultItem(null), - ByteBufCodecs.FLOAT, LegacySmeltingRecipe::getExperience, - ByteBufCodecs.VAR_INT, LegacySmeltingRecipe::getCookingTime, + ByteBufCodecs.STRING_UTF8, LegacySmeltingRecipe::group, + Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.input(), + ItemStack.STREAM_CODEC, recipe -> recipe.result(), + ByteBufCodecs.FLOAT, LegacySmeltingRecipe::experience, + ByteBufCodecs.VAR_INT, LegacySmeltingRecipe::cookingTime, LegacySmeltingRecipe::new); @Override public MapCodec codec() { return CODEC; } 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 b8324fa1a..fab367e21 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java @@ -10,7 +10,7 @@ import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.GsonHelper; import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.Item; @@ -43,7 +43,7 @@ public boolean matches(CraftingInput container, Level level) { 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()) { + if (isTarget(stack) && stack.isDamaged() && foundTarget.isEmpty()) { foundTarget = stack; } else if (plate.test(stack) && !foundPlate) { foundPlate = true; @@ -59,7 +59,7 @@ public ItemStack assemble(CraftingInput container, net.minecraft.core.HolderLook if (!matches(container, null)) return ItemStack.EMPTY; for (int slot = 0; slot < container.size(); slot++) { ItemStack stack = container.getItem(slot); - if (stack.is(target) && stack.isDamaged()) { + if (isTarget(stack) && stack.isDamaged()) { ItemStack repaired = stack.copy(); repaired.setCount(1); repaired.setDamageValue(0); @@ -69,23 +69,29 @@ public ItemStack assemble(CraftingInput container, net.minecraft.core.HolderLook return ItemStack.EMPTY; } - @Override + private boolean isTarget(ItemStack stack) { + if (stack.is(target)) return true; + + String oldId = ForgeRegistries.ITEMS.getKey(target).toString(); + String equivalent = zone.moddev.mc.basemetals.compat.VanillaCopper.output(oldId); + return !equivalent.equals(oldId) + && equivalent.equals(ForgeRegistries.ITEMS.getKey(stack.getItem()).toString()); + } + public boolean canCraftInDimensions(int width, int height) { return width * height >= 2; } - @Override public ItemStack getResultItem(net.minecraft.core.HolderLookup.Provider registries) { return target.getDefaultInstance(); } - @Override - public NonNullList getIngredients() { - return NonNullList.of(Ingredient.EMPTY, Ingredient.of(target), plate); + public java.util.List getIngredients() { + return java.util.List.of(Ingredient.of(target), plate); } @Override - public RecipeSerializer getSerializer() { + public RecipeSerializer getSerializer() { return CrushingRecipe.PLATE_REPAIR_SERIALIZER.get(); } @@ -93,7 +99,7 @@ public static final class Serializer implements RecipeSerializer CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( BuiltInRegistries.ITEM.byNameCodec().fieldOf("target").forGetter(recipe -> recipe.target), - Ingredient.CODEC_NONEMPTY.fieldOf("plate").forGetter(recipe -> recipe.plate)) + Ingredient.CODEC.fieldOf("plate").forGetter(recipe -> recipe.plate)) .apply(instance, PlateRepairRecipe::new)); private static final StreamCodec STREAM_CODEC = 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 417df93a5..eb46776c3 100644 --- a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java +++ b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java @@ -7,8 +7,8 @@ import zone.moddev.mc.basemetals.material.MaterialCatalogue; import zone.moddev.mc.basemetals.material.MaterialDefinition; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.entity.npc.VillagerTrades.ItemListing; +import net.minecraft.world.entity.npc.villager.VillagerProfession; +import net.minecraft.world.entity.npc.villager.VillagerTrades.ItemListing; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -100,12 +100,12 @@ private static ItemListing selling(Item item, int emeralds) { } private static ItemListing selling(Item item, int count, int emeralds) { - return (trader, random) -> new MerchantOffer(new net.minecraft.world.item.trading.ItemCost(Items.EMERALD, Math.max(1, emeralds)), + return (level, trader, random) -> new MerchantOffer(new net.minecraft.world.item.trading.ItemCost(Items.EMERALD, Math.max(1, emeralds)), new ItemStack(item, count), 6, 5, 0.2F); } private static ItemListing enchanted(Item item, int baseCost) { - return (trader, random) -> { + return (level, trader, random) -> { int enchantmentLevel = 5 + random.nextInt(15); ItemStack result = EnchantmentHelper.enchantItem(random, new ItemStack(item), enchantmentLevel, trader.registryAccess(), java.util.Optional.of(trader.registryAccess() diff --git a/src/main/resources/META-INF/coremods.json b/src/main/resources/META-INF/coremods.json deleted file mode 100644 index 2bf71a9de..000000000 --- a/src/main/resources/META-INF/coremods.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "basemetals_118_compatibility": "coremods/basemetals_118_compatibility.js" -} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 614e28432..b2e3b7ff4 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.121011,5.0.0)" +versionRange="[4.1.0.121111,5.0.0)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/basemetals/models/item/door_item.json b/src/main/resources/assets/basemetals/models/item/door_item.json index 006e7ec33..f3eafec9c 100644 --- a/src/main/resources/assets/basemetals/models/item/door_item.json +++ b/src/main/resources/assets/basemetals/models/item/door_item.json @@ -1,4 +1,5 @@ { + "textures": { "particle": "#bottom" }, "ambientocclusion": false, "elements": [ { "from": [ 0, 0, 4 ], diff --git a/src/main/resources/assets/basemetals/models/item/shield.json b/src/main/resources/assets/basemetals/models/item/shield.json index 5752e1e3f..d5c32ce47 100644 --- a/src/main/resources/assets/basemetals/models/item/shield.json +++ b/src/main/resources/assets/basemetals/models/item/shield.json @@ -1,5 +1,6 @@ { "textures": { + "particle": "#shield", "0": "#shield" }, "elements": [ @@ -89,4 +90,4 @@ "scale": [ 0.75, 0.75, 0.75 ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/basemetals/models/item/shield_blocking.json b/src/main/resources/assets/basemetals/models/item/shield_blocking.json index e558e5418..aa65eaf15 100644 --- a/src/main/resources/assets/basemetals/models/item/shield_blocking.json +++ b/src/main/resources/assets/basemetals/models/item/shield_blocking.json @@ -1,5 +1,6 @@ { "textures": { + "particle": "#shield", "0": "#shield" }, "elements": [ @@ -79,4 +80,4 @@ "scale": [ 0.75, 0.75, 0.75 ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json new file mode 100644 index 000000000..4304c4897 --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -0,0 +1,19 @@ +{ + "sources": [ + { + "type": "minecraft:single", + "resource": "minecraft:item/bucket", + "sprite": "basemetals:block/bucket_base" + }, + { + "type": "minecraft:single", + "resource": "forge:item/mask/bucket_fluid", + "sprite": "basemetals:block/bucket_fluid" + }, + { + "type": "minecraft:single", + "resource": "forge:item/mask/bucket_fluid_cover", + "sprite": "basemetals:block/bucket_cover" + } + ] +} diff --git a/src/main/resources/basemetals.mixins.json b/src/main/resources/basemetals.mixins.json new file mode 100644 index 000000000..a6b98faa4 --- /dev/null +++ b/src/main/resources/basemetals.mixins.json @@ -0,0 +1,19 @@ +{ + "required": true, + "minVersion": "0.8.7", + "package": "zone.moddev.mc.basemetals.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "AnvilBlockMixin", + "AnvilMenuMixin", + "BlockStateDataMixin", + "LevelCapabilityDataMixin", + "LevelStorageSourceMixin", + "OreSpawnEarlyTagCompatibilityMixin", + "SimpleRegionStorageMixin", + "WorldGenRegionMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/coremods/basemetals_118_compatibility.js b/src/main/resources/coremods/basemetals_118_compatibility.js deleted file mode 100644 index 472da246f..000000000 --- a/src/main/resources/coremods/basemetals_118_compatibility.js +++ /dev/null @@ -1,109 +0,0 @@ -var Opcodes = Java.type('org.objectweb.asm.Opcodes'); -var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode'); -var InsnList = Java.type('org.objectweb.asm.tree.InsnList'); -var JumpInsnNode = Java.type('org.objectweb.asm.tree.JumpInsnNode'); -var LabelNode = Java.type('org.objectweb.asm.tree.LabelNode'); -var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); -var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); -var HOOK = 'zone/moddev/mc/basemetals/migration/LegacyWorldDataHook'; -var NBT = 'Lnet/minecraft/nbt/CompoundTag;'; -var STATE = 'Lnet/minecraft/world/level/block/state/BlockState;'; -var ASMAPI = Java.type('net.minecraftforge.coremod.api.ASMAPI'); - -function initializeCoreMod() { - return { - 'basemetals_expand_flattening_table': { - 'target': { 'type': 'CLASS', 'name': 'net.minecraft.util.datafix.fixes.BlockStateData' }, - 'transformer': function(node) { - var patched = false; - for (var i = 0; i < node.fields.size(); ++i) { - var field = node.fields.get(i); - if (field.name !== 'MAP' - || field.desc !== '[Lcom/mojang/serialization/Dynamic;') continue; - // Modded numeric IDs need more room than vanilla's 4096-entry table. - field.access &= ~Opcodes.ACC_FINAL; - patched = true; - } - if (!patched) throw new Error('Base Metals could not make the legacy block table expandable'); - return node; - } - }, - 'basemetals_legacy_world_info': { - 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.level.storage.LevelStorageSource' }, - 'transformer': function(node) { - var patched = false; - for (var i = 0; i < node.methods.size(); ++i) { - var method = node.methods.get(i); - if (method.name !== 'readLevelDataTagFixed' - || method.desc !== '(Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lcom/mojang/serialization/Dynamic;') continue; - // Keep legacy IDs and item damage intact before Mojang updates level.dat. - var prefix = new InsnList(); - prefix.add(new VarInsnNode(Opcodes.ALOAD, 0)); - prefix.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, 'java/nio/file/Path', - 'toFile', '()Ljava/io/File;', true)); - prefix.add(new MethodInsnNode(Opcodes.INVOKESTATIC, HOOK, - 'prepareLegacyWorld', '(Ljava/io/File;)V', false)); - method.instructions.insert(prefix); - patched = true; - } - if (!patched) throw new Error('Base Metals could not attach its legacy level.dat reader'); - return node; - } - }, - 'basemetals_legacy_chunk_status': { - 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.level.chunk.storage.ChunkStorage' }, - 'transformer': function(node) { - var patched = false; - for (var i = 0; i < node.methods.size(); ++i) { - var method = node.methods.get(i); - if (method.desc !== '(Lnet/minecraft/resources/ResourceKey;' + - 'Ljava/util/function/Supplier;' + NBT + 'Ljava/util/Optional;)' + NBT) continue; - - // Restore mod IDs before vanilla flattens the numeric block palette. - var prefix = new InsnList(); - prefix.add(new VarInsnNode(Opcodes.ALOAD, 3)); - prefix.add(new MethodInsnNode(Opcodes.INVOKESTATIC, HOOK, - 'prepareLegacyChunk', '(' + NBT + ')V', false)); - method.instructions.insert(prefix); - - for (var instruction = method.instructions.getFirst(); instruction !== null; - instruction = instruction.getNext()) { - if (instruction.getOpcode() === Opcodes.ARETURN) { - method.instructions.insertBefore(instruction, new MethodInsnNode(Opcodes.INVOKESTATIC, - HOOK, 'finalizeLegacyChunk', '(' + NBT + ')' + NBT, false)); - } - } - patched = true; - } - if (!patched) throw new Error('Base Metals could not attach its legacy chunk converter'); - return node; - } - }, - 'basemetals_legacy_worldgen_guard': { - 'target': { 'type': 'CLASS', 'name': 'net.minecraft.server.level.WorldGenRegion' }, - 'transformer': function(node) { - var patched = false; - for (var i = 0; i < node.methods.size(); ++i) { - var method = node.methods.get(i); - // Both setBlock and direct ore-section writes use this permission check. - if (method.name !== 'ensureCanWrite' - || method.desc !== '(Lnet/minecraft/core/BlockPos;)Z') continue; - var allowed = new LabelNode(); - var prefix = new InsnList(); - prefix.add(new VarInsnNode(Opcodes.ALOAD, 0)); - prefix.add(new VarInsnNode(Opcodes.ALOAD, 1)); - prefix.add(new MethodInsnNode(Opcodes.INVOKESTATIC, HOOK, - 'shouldBlockWorldgenWrite', '(Lnet/minecraft/server/level/WorldGenRegion;Lnet/minecraft/core/BlockPos;)Z', false)); - prefix.add(new JumpInsnNode(Opcodes.IFEQ, allowed)); - prefix.add(new InsnNode(Opcodes.ICONST_0)); - prefix.add(new InsnNode(Opcodes.IRETURN)); - prefix.add(allowed); - method.instructions.insert(prefix); - patched = true; - } - if (!patched) throw new Error('Base Metals could not protect existing legacy terrain'); - return node; - } - } - }; -} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 5cb9139dd..64d20e29e 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "${mod_id} resources", - "pack_format": 34, - "supported_formats": {"min_inclusive": 34, "max_inclusive": 48} + "min_format": [94, 1], + "max_format": [94, 1] } } diff --git a/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedClientSmokeMod.java b/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedClientSmokeMod.java index 3ec3f80f2..f38c573df 100644 --- a/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedClientSmokeMod.java +++ b/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedClientSmokeMod.java @@ -1,6 +1,6 @@ package zone.moddev.mc.basemetals.smoke; -import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.fml.common.Mod; /** Loads the existing integrated-world assertions from an isolated packaged probe mod. */ @@ -9,7 +9,7 @@ public final class PackagedClientSmokeMod { public static final String MOD_ID = "basemetals_client_smoke"; public PackagedClientSmokeMod() { - MinecraftForge.EVENT_BUS.register(IntegratedWorldSmoke.class); - MinecraftForge.EVENT_BUS.register(RemoteLoginSmoke.class); + IntegratedWorldSmoke.register(); + TickEvent.ClientTickEvent.Post.BUS.addListener(RemoteLoginSmoke::tick); } } 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 f7063c183..f7d52008b 100644 --- a/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java +++ b/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java @@ -5,9 +5,9 @@ import net.minecraft.client.gui.screens.DisconnectedScreen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.config.BaseMetalsConfig; import zone.moddev.mc.basemetals.config.ContentMode; @@ -24,8 +24,8 @@ public final class RemoteLoginSmoke { private RemoteLoginSmoke() {} @SubscribeEvent - public static void tick(TickEvent.ClientTickEvent event) { - if (event.phase != TickEvent.Phase.END || completed || !Boolean.getBoolean("basemetals.remoteLoginSmoke")) return; + public static void tick(TickEvent.ClientTickEvent.Post event) { + if (completed || !Boolean.getBoolean("basemetals.remoteLoginSmoke")) return; Minecraft minecraft = Minecraft.getInstance(); if (++ticks > 3600) throw new IllegalStateException("MODE_LOGIN_SMOKE FAIL: timed out at " + (minecraft.screen == null ? "gameplay" : minecraft.screen.getClass().getName())); @@ -43,16 +43,14 @@ public static void tick(TickEvent.ClientTickEvent event) { if (minecraft.player != null && minecraft.level != null) { if (reject) throw new IllegalStateException("MODE_LOGIN_SMOKE FAIL: mismatched modes entered gameplay"); if (++joinedTicks < 40) return; - var recipe = minecraft.level.getRecipeManager().byKey(ResourceLocation.parse("basemetals:adamantine_bow")) - .orElseThrow(); - if (recipe.value().isSpecial() != (BaseMetalsConfig.activeMode() == ContentMode.LOW_FANTASY)) { - throw new IllegalStateException("MODE_LOGIN_SMOKE FAIL: recipe policy was not synchronized"); + if (minecraft.player.connection == null) { + throw new IllegalStateException("MODE_LOGIN_SMOKE FAIL: gameplay has no live connection"); } connections++; if (connections < Integer.getInteger("basemetals.loginSmokeConnections", 1)) { BaseMetals.LOGGER.info("BASEMETALS_MODE_RECONNECT connection={}", connections); - minecraft.level.disconnect(); - minecraft.disconnect(new TitleScreen()); + minecraft.level.disconnect(net.minecraft.network.chat.Component.literal("Reconnect smoke")); + minecraft.disconnect(new TitleScreen(), false); connecting = false; titleTicks = 0; joinedTicks = 0; diff --git a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml index c29d34d31..931fea1c0 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.1.121011]" +versionRange="[3.1.1.121111]" ordering="AFTER" side="CLIENT" [[dependencies.basemetals_client_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.121011]" +versionRange="[4.1.0.121111]" 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 ff7522606..8d13fffd9 100644 --- a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java +++ b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java @@ -10,9 +10,7 @@ import com.mojang.logging.LogUtils; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.server.ServerStartedEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; @@ -23,27 +21,33 @@ public final class PackagedServerSmoke { private static final Logger LOGGER = LogUtils.getLogger(); public PackagedServerSmoke() { - MinecraftForge.EVENT_BUS.register(this); + ServerStartedEvent.BUS.addListener(this::onServerStarted); + + if (Boolean.getBoolean("basemetals.capabilityDiskSmoke")) { + SavedWorldCapabilitySmoke.register(); + } + if (Boolean.getBoolean("basemetals.upgradeWorldSmoke")) { try { - MinecraftForge.EVENT_BUS.register(Class.forName( - "zone.moddev.mc.basemetals.smoke.UpgradeWorldSmoke")); - } catch (ClassNotFoundException exception) { - throw new IllegalStateException("The upgrade probe is missing from the test jar", exception); + Class.forName("zone.moddev.mc.basemetals.smoke.UpgradeWorldSmoke") + .getMethod("register").invoke(null); + } catch (ReflectiveOperationException exception) { + throw new IllegalStateException("Could not register the isolated upgrade probe", exception); } } } - @SubscribeEvent - public void onServerStarted(ServerStartedEvent event) throws IOException { + public void onServerStarted(ServerStartedEvent event) { String baseMetals = version("basemetals"); String oreSpawn = version("orespawn"); - if (!"3.1.1.121011".equals(baseMetals) || !"4.1.0.121011".equals(oreSpawn)) { + if (!"3.1.1.121111".equals(baseMetals) || !"4.1.0.121111".equals(oreSpawn)) { throw new IllegalStateException("PACKAGED_SERVER_SMOKE FAIL versions basemetals=" + baseMetals + " orespawn=" + oreSpawn); } verifyContent(event.getServer()); if (Boolean.getBoolean("basemetals.oreSampleSmoke")) verifyOreSample(event.getServer()); + if (Boolean.getBoolean("basemetals.modernFlatWorldSmoke")) verifyModernFlatTerrain(event.getServer()); + if (Boolean.getBoolean("basemetals.capabilityDiskSmoke")) SavedWorldCapabilitySmoke.verify(event.getServer()); Properties result = new Properties(); result.setProperty("basemetals", baseMetals); result.setProperty("orespawn", oreSpawn); @@ -52,6 +56,8 @@ public void onServerStarted(ServerStartedEvent event) throws IOException { .resolve("packaged-server-smoke-pass.properties"); try (var writer = Files.newBufferedWriter(marker, StandardCharsets.UTF_8)) { result.store(writer, "Base Metals packaged dedicated-server smoke"); + } catch (IOException exception) { + throw new java.io.UncheckedIOException("Could not save the server smoke result", exception); } LOGGER.info("BASEMETALS_PACKAGED_SERVER_SMOKE PASS basemetals={} orespawn={} forge={}", baseMetals, oreSpawn, result.getProperty("forge")); @@ -66,7 +72,7 @@ private static String version(String modId) { .getModInfo().getVersion().toString(); } - private static void verifyContent(net.minecraft.server.MinecraftServer server) throws IOException { + private static void verifyContent(net.minecraft.server.MinecraftServer server) { var level = server.overworld(); var policy = zone.moddev.mc.basemetals.config.ContentPolicy.active(); var items = zone.moddev.mc.basemetals.content.ModContent.itemsById(); @@ -74,21 +80,25 @@ private static void verifyContent(net.minecraft.server.MinecraftServer server) t for (var entry : items.entrySet()) { String id = entry.getKey(); if (id.endsWith("_powder") || id.endsWith("_smallpowder") || id.endsWith("_nugget")) { - int burn = net.minecraftforge.common.ForgeHooks.getBurnTime(entry.getValue().get().getDefaultInstance(), + int burn = server.fuelValues().burnDuration(entry.getValue().get().getDefaultInstance(), net.minecraft.world.item.crafting.RecipeType.SMELTING); int expected = id.startsWith("coal_") || id.startsWith("charcoal_") ? (id.endsWith("_powder") ? 1600 : 200) : 0; if (burn != expected) throw new IllegalStateException(id + " has burn time " + burn + ", expected " + expected); } } - var bow = server.getRecipeManager().byKey(net.minecraft.resources.ResourceLocation.parse("basemetals:adamantine_bow")) + var bow = server.getRecipeManager().byKey(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.RECIPE, net.minecraft.resources.Identifier.parse("basemetals:adamantine_bow"))) .orElseThrow(); boolean enabled = !bow.value().isSpecial(); if (enabled != policy.allows("basemetals:adamantine_bow")) { throw new IllegalStateException("The recipe book does not follow the active content mode"); } if (ModList.get().isLoaded("tconstruct")) verifyTinkers(); - verifyIntegrationRecipes(server); + try { + verifyIntegrationRecipes(server); + } catch (IOException exception) { + throw new java.io.UncheckedIOException("Could not read the integration recipes", exception); + } LOGGER.info("BASEMETALS_PACKAGED_CONTENT PASS mode={} items={}", zone.moddev.mc.basemetals.config.BaseMetalsConfig.activeMode().serializedName(), items.size()); } @@ -112,9 +122,9 @@ 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 = net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("basemetals", + var id = net.minecraft.resources.Identifier.fromNamespaceAndPath("basemetals", path.substring("recipe/".length(), path.length() - ".json".length())); - if (server.getRecipeManager().byKey(id).isPresent() != enabled) { + if (server.getRecipeManager().byKey(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.RECIPE, id)).isPresent() != enabled) { throw new IllegalStateException("Integration recipe does not follow content mode: " + id); } checked++; @@ -132,8 +142,11 @@ private static void verifyOreSample(net.minecraft.server.MinecraftServer server) for (var level : server.getAllLevels()) { var dimension = level.dimension(); var counts = new java.util.TreeMap(); - for (int chunkX = 0; chunkX < 3; chunkX++) { - for (int chunkZ = 0; chunkZ < 3; chunkZ++) { + int start = dimension == net.minecraft.world.level.Level.OVERWORLD + ? Integer.getInteger("basemetals.oreSampleOverworldChunkStart", 0) : 0; + + for (int chunkX = start; chunkX < start + 3; chunkX++) { + for (int chunkZ = start; chunkZ < start + 3; chunkZ++) { var chunk = level.getChunk(chunkX, chunkZ); for (var section : chunk.getSections()) { for (int x = 0; x < 16; x++) for (int y = 0; y < 16; y++) for (int z = 0; z < 16; z++) { @@ -153,11 +166,58 @@ private static void verifyOreSample(net.minecraft.server.MinecraftServer server) } } if (counts.isEmpty()) throw new IllegalStateException("No Base Metals ores in " + dimension); - LOGGER.info("BASEMETALS_ORE_SAMPLE PASS dimension={} chunks=9 ores={}", dimension.location(), counts); + if (Boolean.getBoolean("basemetals.tagOnlyTinSmoke") + && dimension == net.minecraft.world.level.Level.OVERWORLD + && counts.getOrDefault("tin_ore", 0) == 0) { + throw new IllegalStateException("The tag-only tin rule produced no ore after tags were loaded"); + } + LOGGER.info("BASEMETALS_ORE_SAMPLE PASS dimension={} chunks=9 ores={}", dimension.identifier(), counts); } } private static void verifyTinkers() { - throw new IllegalStateException("Tinkers integration is not enabled in this Forge 1.21.1 build"); + throw new IllegalStateException("Tinkers integration is not enabled in this Forge 1.21.11 build"); + } + + private static void verifyModernFlatTerrain(net.minecraft.server.MinecraftServer server) { + var level = server.overworld(); + if (!(level.getChunkSource().getGenerator() instanceof net.minecraft.world.level.levelgen.FlatLevelSource)) { + throw new IllegalStateException("The modern-world control must use its captured flat generator"); + } + + int start = Boolean.getBoolean("basemetals.modernLaterChunkSmoke") ? 10 : 0; + int checked = 0; + + for (int chunkX = start; chunkX < start + 3; chunkX++) { + for (int chunkZ = start; chunkZ < start + 3; chunkZ++) { + var chunk = level.getChunk(chunkX, chunkZ); + + for (int sectionIndex = 0; sectionIndex < chunk.getSectionsCount(); sectionIndex++) { + var section = chunk.getSection(sectionIndex); + int bottom = chunk.getSectionYFromSectionIndex(sectionIndex) * 16; + + for (int y = 0; y < 16; y++) { + int height = bottom + y; + var expected = height == -64 ? net.minecraft.world.level.block.Blocks.BEDROCK + : height == -63 || height == -62 ? net.minecraft.world.level.block.Blocks.DIRT + : height == -61 ? net.minecraft.world.level.block.Blocks.GRASS_BLOCK + : net.minecraft.world.level.block.Blocks.AIR; + + for (int x = 0; x < 16; x++) { + for (int z = 0; z < 16; z++) { + if (!section.getBlockState(x, y, z).is(expected)) { + throw new IllegalStateException("Modern terrain changed at chunk " + + chunk.getPos() + ", local " + x + "," + height + "," + z); + } + checked++; + } + } + } + } + } + } + + LOGGER.info("BASEMETALS_MODERN_TERRAIN PASS blocks={} later_chunks={}", + checked, start != 0); } } diff --git a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/SavedWorldCapabilitySmoke.java b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/SavedWorldCapabilitySmoke.java new file mode 100644 index 000000000..a4bfe668c --- /dev/null +++ b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/SavedWorldCapabilitySmoke.java @@ -0,0 +1,68 @@ +package zone.moddev.mc.basemetals.smoke; + +import java.util.IdentityHashMap; +import java.util.Map; + +import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.Identifier; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.level.Level; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilitySerializable; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.event.AttachCapabilitiesEvent; +import zone.moddev.mc.basemetals.BaseMetals; + +/** Checks an actual older capabilities.dat file through Forge's normal load and save path. */ +final class SavedWorldCapabilitySmoke { + private static final Map LEVELS = new IdentityHashMap<>(); + + private SavedWorldCapabilitySmoke() {} + + static void register() { + AttachCapabilitiesEvent.Levels.BUS.addListener(event -> { + var data = new ProbeData(); + LEVELS.put(event.getObject(), data); + event.addCapability(Identifier.parse("basemetals_server_smoke:legacy_data"), data); + }); + } + + static void verify(MinecraftServer server) { + var data = LEVELS.get(server.overworld()); + var expected = new CompoundTag(); + expected.putInt("counter", 37); + expected.putString("note", "Saved before Forge 61"); + var nested = new CompoundTag(); + nested.putIntArray("custom_array", new int[] {4, 8, 15, 16, 23, 42}); + nested.putString("owner", "Existing world"); + expected.put("nested", nested); + + if (data == null || !expected.equals(data.value)) { + throw new IllegalStateException("Saved world-capability data was lost or changed: " + + (data == null ? "no provider" : data.value)); + } + + BaseMetals.LOGGER.info("BASEMETALS_SAVED_CAPABILITY PASS nonempty_disk_payload=unchanged"); + } + + private static final class ProbeData implements ICapabilitySerializable { + private CompoundTag value = new CompoundTag(); + + @Override + public LazyOptional getCapability(Capability capability, Direction side) { + return LazyOptional.empty(); + } + + @Override + public CompoundTag serializeNBT(HolderLookup.Provider registries) { + return value.copy(); + } + + @Override + public void deserializeNBT(HolderLookup.Provider registries, CompoundTag saved) { + value = saved.copy(); + } + } +} diff --git a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml index 2b4aea8b7..b03103032 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.1.121011]" +versionRange="[3.1.1.121111]" ordering="AFTER" side="SERVER" [[dependencies.basemetals_server_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.121011]" +versionRange="[4.1.0.121111]" ordering="AFTER" side="SERVER" diff --git a/src/smoke/datapack/pack.mcmeta b/src/smoke/datapack/pack.mcmeta index 848430838..e601bae19 100644 --- a/src/smoke/datapack/pack.mcmeta +++ b/src/smoke/datapack/pack.mcmeta @@ -1,6 +1,7 @@ { "pack": { - "pack_format": 48, + "min_format": [94, 1], + "max_format": [94, 1], "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 de5ede19d..534fe6b76 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( - net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("mmdlib", "liquid_mercury").getPath())); + net.minecraft.resources.Identifier.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 index 1eb2dccce..33426e606 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/CopperCompatibilityTest.java @@ -17,7 +17,12 @@ class CopperCompatibilityTest { 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; + String recipeId = switch (id) { + case "copper_ingot" -> "copper_ingot_from_nuggets"; + case "copper_nugget" -> "copper_nuggets"; + case "copper_horse_armor" -> "copper_horsearmor"; + default -> id; + }; assertEquals(entry.getValue(), recipe(recipeId).getAsJsonObject("result") .get("id").getAsString(), recipeId); @@ -31,7 +36,8 @@ void oldCopperItemsAndBlocksRemainRegistered() throws Exception { for (String item : VanillaCopper.equivalents().keySet()) { assertTrue(manifest.getAsJsonArray("items").toString().contains('"' + item + '"'), item); - if (!item.endsWith("_ingot")) { + if (java.util.List.of("block", "door", "trapdoor", "slab", "stairs", "bars") + .contains(item.substring("basemetals:copper_".length()))) { assertTrue(manifest.getAsJsonArray("blocks").toString().contains('"' + item + '"'), item); } } @@ -79,6 +85,6 @@ private static JsonObject recipe(String id) throws Exception { } private static JsonObject read(Path path) throws Exception { - return JsonParser.parseString(Files.readString(path)).getAsJsonObject(); + return RecipeDataSemantics.normalize(JsonParser.parseString(Files.readString(path))).getAsJsonObject(); } } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java index cb78a6ecf..f599ed042 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1211ResourceTest.java @@ -14,12 +14,15 @@ class Minecraft1211ResourceTest { @Test - void resourceAndDataPacksUseThe1211Formats() throws Exception { + void resourceAndDataPacksUseThe12111Formats() throws Exception { var pack = read("src/main/resources/pack.mcmeta").getAsJsonObject("pack"); - assertEquals(34, pack.get("pack_format").getAsInt()); - var formats = pack.getAsJsonObject("supported_formats"); - assertEquals(34, formats.get("min_inclusive").getAsInt()); - assertEquals(48, formats.get("max_inclusive").getAsInt()); + assertEquals("[94,1]", pack.get("min_format").toString()); + assertEquals("[94,1]", pack.get("max_format").toString()); + net.minecraft.SharedConstants.tryDetectVersion(); + var resources = net.minecraft.SharedConstants.getCurrentVersion() + .packVersion(net.minecraft.server.packs.PackType.CLIENT_RESOURCES); + assertEquals(75, resources.major()); + assertEquals(0, resources.minor()); } @Test diff --git a/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java b/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java new file mode 100644 index 000000000..68288d789 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/data/NativeAssetDefinitionTest.java @@ -0,0 +1,90 @@ +package zone.moddev.mc.basemetals.data; + +import static org.junit.jupiter.api.Assertions.*; + +import java.nio.file.Files; +import java.nio.file.Path; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.jupiter.api.Test; + +class NativeAssetDefinitionTest { + private static final Path ASSETS = Path.of("src/generated/resources/assets/basemetals"); + + @Test + void everySavedItemHasANativeModelDefinition() throws Exception { + var manifest = read(Path.of("src/generated/resources/data/basemetals/registry_manifest.json")); + int count = 0; + for (var item : manifest.getAsJsonArray("items")) { + String id = item.getAsString().substring("basemetals:".length()); + var definition = read(ASSETS.resolve("items/" + id + ".json")); + assertTrue(definition.has("model"), id); + checkModels(definition.get("model")); + count++; + } + assertEquals(1127, count); + } + + @Test + void armourAssetsHaveBothPlayerLayersAndTheHorseLayer() throws Exception { + try (var files = Files.list(ASSETS.resolve("equipment"))) { + for (Path file : files.toList()) { + var layers = read(file).getAsJsonObject("layers"); + for (String layer : new String[] {"humanoid", "humanoid_leggings", "horse_body"}) { + String texture = layers.getAsJsonArray(layer).get(0).getAsJsonObject() + .get("texture").getAsString().substring("basemetals:".length()); + assertTrue(Files.isRegularFile(ASSETS.resolve( + "textures/entity/equipment/" + layer + "/" + texture + ".png")), file.toString()); + } + } + } + } + + @Test + void filledBucketsKeepTheirSpritesOnTheBlockAtlas() throws Exception { + var atlas = read(Path.of("src/main/resources/assets/minecraft/atlases/blocks.json")); + assertEquals(3, atlas.getAsJsonArray("sources").size()); + + try (var files = Files.list(ASSETS.resolve("models/item"))) { + var buckets = files.filter(file -> file.getFileName().toString().endsWith("_bucket.json")).toList(); + assertEquals(36, buckets.size()); + + for (Path file : buckets) { + var textures = read(file).getAsJsonObject("textures"); + assertEquals("basemetals:block/bucket_base", textures.get("base").getAsString()); + assertEquals("basemetals:block/bucket_cover", textures.get("cover").getAsString()); + assertEquals("#base", textures.get("particle").getAsString()); + } + } + } + + @Test + void copperAgeAddsNoNewSaveIdentities() { + assertEquals(18, zone.moddev.mc.basemetals.compat.VanillaCopper.equivalents().size()); + assertEquals("minecraft:copper_nugget", zone.moddev.mc.basemetals.compat.VanillaCopper.output("basemetals:copper_nugget")); + assertEquals("minecraft:copper_horse_armor", zone.moddev.mc.basemetals.compat.VanillaCopper.output("basemetals:copper_horse_armor")); + assertEquals("basemetals:copper_bow", zone.moddev.mc.basemetals.compat.VanillaCopper.output("basemetals:copper_bow")); + } + + private static void checkModels(JsonElement element) { + if (element.isJsonArray()) { + element.getAsJsonArray().forEach(NativeAssetDefinitionTest::checkModels); + } else if (element.isJsonObject()) { + var object = element.getAsJsonObject(); + if (object.has("model") && object.get("model").isJsonPrimitive()) { + String model = object.get("model").getAsString(); + if (model.startsWith("basemetals:")) { + String path = "models/" + model.substring("basemetals:".length()) + ".json"; + assertTrue(Files.isRegularFile(ASSETS.resolve(path)) || Files.isRegularFile( + Path.of("src/main/resources/assets/basemetals").resolve(path)), model); + } + } + object.entrySet().forEach(entry -> checkModels(entry.getValue())); + } + } + + private static JsonObject read(Path file) throws Exception { + return JsonParser.parseString(Files.readString(file)).getAsJsonObject(); + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java b/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java index b81d489e2..d68a838e0 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java @@ -53,8 +53,9 @@ void allThirteenNativeModelsKeepKirisTwoLayerGeometry() throws Exception { @Test void providerUsesForgeAndRemainsOutsideTheProductionSourceSet() throws Exception { String provider = Files.readString(Paths.get("src/dataGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java")); - assertTrue(provider.contains("extends BlockStateProvider")); - assertTrue(provider.contains(".allFaces((direction, face) -> face.texture(\"#overlay\").cullface(direction))")); + assertTrue(provider.contains("implements DataProvider")); + assertTrue(provider.contains("elements.add(cube(-OVERLAY_OFFSET, 16 + OVERLAY_OFFSET, \"#overlay\"))")); + assertTrue(provider.contains("\"texture\", texture, \"cullface\", direction")); assertTrue(provider.contains("@author KiriCattus")); assertFalse(Files.isRegularFile(Paths.get("src/modelGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java"))); assertFalse(Files.exists(Paths.get("src/main/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java"))); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/RecipeDataSemantics.java b/src/test/java/zone/moddev/mc/basemetals/data/RecipeDataSemantics.java new file mode 100644 index 000000000..9c12b4b13 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/data/RecipeDataSemantics.java @@ -0,0 +1,44 @@ +package zone.moddev.mc.basemetals.data; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +/** Lets historical quantity checks compare ingredients independently of their JSON spelling. */ +final class RecipeDataSemantics { + private RecipeDataSemantics() {} + + static JsonElement normalize(JsonElement value) { + if (!value.isJsonObject()) return value; + JsonObject recipe = value.getAsJsonObject(); + if (recipe.has("recipe")) normalize(recipe.get("recipe")); + + for (String field : new String[] {"ingredient", "ingredients", "plate"}) { + if (recipe.has(field)) recipe.add(field, ingredient(recipe.get(field))); + } + if (recipe.has("key") && recipe.get("key").isJsonObject()) { + JsonObject key = recipe.getAsJsonObject("key"); + for (String symbol : new java.util.ArrayList<>(key.keySet())) { + key.add(symbol, ingredient(key.get(symbol))); + } + } + + return value; + } + + private static JsonElement ingredient(JsonElement value) { + if (value.isJsonPrimitive()) { + String id = value.getAsString(); + JsonObject result = new JsonObject(); + result.addProperty(id.startsWith("#") ? "tag" : "item", id.startsWith("#") ? id.substring(1) : id); + return result; + } + if (value.isJsonArray()) { + JsonArray result = new JsonArray(); + value.getAsJsonArray().forEach(entry -> result.add(ingredient(entry))); + return result; + } + + return value; + } +} 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 ced63a243..2d7b7f4a6 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java @@ -202,7 +202,7 @@ private static double units(JsonObject ingredient, String material) { private static JsonObject read(Path path) throws Exception { try (Reader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) { - JsonObject json = new JsonParser().parse(reader).getAsJsonObject(); + JsonObject json = RecipeDataSemantics.normalize(JsonParser.parseReader(reader)).getAsJsonObject(); return json.has("recipe") ? json.getAsJsonObject("recipe") : json; } } 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 d63572d90..e1f6ff68e 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java @@ -384,7 +384,7 @@ void legacyCraftingYieldsIngredientsAndAlternateRecipesAreRestored() throws Exce assertRecipeIngredientTag("copper_block_ingot", "forge:storage_blocks/copper"); assertRecipeIngredientTag("tin_block_ingot", "forge:storage_blocks/tin"); assertRecipeIngredientTag("copper_nuggets", "forge:ingots/copper"); - assertRecipeKeyItem("copper_ingot_from_nuggets", "X", "basemetals:copper_nugget"); + assertRecipeKeyTag("copper_ingot_from_nuggets", "X", "forge:nuggets/copper"); assertRecipeResult("iron_plate", "basemetals:iron_plate", 3); assertRecipeResult("gold_plate", "basemetals:gold_plate", 3); @@ -706,6 +706,28 @@ private static String path(String id) { } private static void assertResource(String relative) { + if (relative.startsWith("assets/basemetals/textures/") && relative.endsWith(".png")) { + String sprite = "basemetals:" + relative.substring("assets/basemetals/textures/".length(), + relative.length() - ".png".length()); + + try { + var sources = JsonParser.parseString(Files.readString( + MAIN.resolve("assets/minecraft/atlases/blocks.json"))) + .getAsJsonObject().getAsJsonArray("sources"); + + for (var source : sources) { + var alias = source.getAsJsonObject(); + if (alias.has("sprite") && alias.get("sprite").getAsString().equals(sprite)) { + assertEquals("minecraft:single", alias.get("type").getAsString()); + assertTrue(alias.get("resource").getAsString().matches("(?:minecraft|forge):[a-z0-9_./-]+")); + return; + } + } + } catch (IOException exception) { + throw new AssertionError("Could not read the block-atlas aliases", exception); + } + } + assertTrue(Files.isRegularFile(resource(relative)), "Missing resource " + relative); } @@ -717,7 +739,7 @@ private static Path resource(String relative) { private static JsonElement read(Path path) throws IOException { try (Reader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) { - JsonElement value = JsonParser.parseReader(reader); + JsonElement value = RecipeDataSemantics.normalize(JsonParser.parseReader(reader)); if (value.isJsonObject() && value.getAsJsonObject().has("recipe") && "basemetals:content_crafting".equals(value.getAsJsonObject().get("type").getAsString())) { return value.getAsJsonObject().get("recipe"); diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java index 6a88ed8f5..bc97cb1fd 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyMigrationSafetyTest.java @@ -40,6 +40,12 @@ /** Checks the migration boundary without opening a player's save. */ class LegacyMigrationSafetyTest { + @BeforeAll + static void bootstrapRegistries() { + SharedConstants.tryDetectVersion(); + net.minecraft.server.Bootstrap.bootStrap(); + } + @TempDir(cleanup = CleanupMode.ON_SUCCESS) Path temporaryWorld; @@ -94,7 +100,7 @@ void modernExternalChunk() throws Exception { @Test void modernLz4Chunk() throws Exception { - assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.1"), "Native LZ4 is not available on older targets"); + assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.11"), "Native LZ4 is not available on older targets"); Path world = world("lz4", false); Path file = region(world, false, true); assertTrue(nativeAccepts(file, false)); @@ -171,7 +177,7 @@ void savedRegistryCanBeScannedWithAnEmptyRegion() throws Exception { @Test void savedRegistryCanBeScannedWithLz4Chunks() throws Exception { - assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.1")); + assumeTrue(VERSION.equals("1.20.6") || VERSION.equals("1.21.11")); Path world = world("saved-registry-lz4", false); writeRegistry(world.resolve("basemetals-legacy-registry.dat")); Path file = region(world, false, true); @@ -274,9 +280,9 @@ void mixedRegionsAndLaterOpenedCustomDimensionChunksKeepTheirContents() throws E 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(1456, chunk.getIntOr("DataVersion", 0)); assertEquals("example:legacy_block", - Legacy112WorldMigrator.stateAtForTest(chunk, 0, 0).getString("Name")); + Legacy112WorldMigrator.stateAtForTest(chunk, 0, 0).getStringOr("Name", "")); assertTrue(Files.exists(world.resolve("basemetals-1.12-region-backup").resolve(world.relativize(file)))); } assertEquals(37, experience(world.resolve("level.dat"))); @@ -440,7 +446,7 @@ private static void integer(DataOutputStream output, String key, int value) thro 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"); + return NbtIo.read(input).getCompoundOrEmpty("Data").getCompoundOrEmpty("Player").getIntOr("XpLevel", 0); } } @@ -488,7 +494,7 @@ private static boolean nativeAccepts(Path file, boolean empty) throws IOExceptio } assertNotNull(input); - assertEquals(DATA_VERSION, NbtIo.read(input).getInt("DataVersion")); + assertEquals(DATA_VERSION, NbtIo.read(input).getIntOr("DataVersion", 0)); return true; } } diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldCapabilityCodecTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldCapabilityCodecTest.java new file mode 100644 index 000000000..c6834aa63 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldCapabilityCodecTest.java @@ -0,0 +1,43 @@ +package zone.moddev.mc.basemetals.migration; + +import static org.junit.jupiter.api.Assertions.*; + +import com.mojang.serialization.Codec; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtOps; +import org.junit.jupiter.api.Test; + +class LegacyWorldCapabilityCodecTest { + private static final Codec CODEC = LegacyWorldCapabilityCodec.acceptLegacyPayload( + CompoundTag.CODEC.fieldOf("data").codec()); + + @Test + void readsBothFormatsAndWritesOnlyTheCurrentFormat() { + CompoundTag contents = new CompoundTag(); + contents.putLongArray("custom_array", new long[] {11, 22, 33}); + contents.putString("owner", "Existing world"); + CompoundTag legacy = new CompoundTag(); + legacy.put("another_mod:world_data", contents); + CompoundTag original = legacy.copy(); + + CompoundTag loaded = CODEC.parse(NbtOps.INSTANCE, legacy).getOrThrow(); + assertEquals(original, loaded); + assertEquals(original, legacy, "Reading must not modify the original tag"); + + var encoded = CODEC.encodeStart(NbtOps.INSTANCE, loaded).getOrThrow(); + assertEquals(original, ((CompoundTag) encoded).getCompoundOrEmpty("data")); + assertEquals(original, CODEC.parse(NbtOps.INSTANCE, encoded).getOrThrow()); + } + + @Test + void acceptsEmptyOldDataButRejectsBrokenCurrentData() { + assertTrue(CODEC.parse(NbtOps.INSTANCE, new CompoundTag()).isSuccess()); + CompoundTag malformed = new CompoundTag(); + malformed.putInt("data", 12); + assertTrue(CODEC.parse(NbtOps.INSTANCE, malformed).isError()); + + CompoundTag unrelated = new CompoundTag(); + unrelated.putString("unexpected_key", "not a capability ID"); + assertTrue(CODEC.parse(NbtOps.INSTANCE, unrelated).isError()); + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java index 56b504510..f41222cd1 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java @@ -9,21 +9,20 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; class LegacyWorldDataHookTest { @TempDir Path world; @Test void levelHookPassesTheFileBeforeComponentConversion() throws IOException { - String hook = Files.readString(Path.of("src/main/resources/coremods/basemetals_118_compatibility.js")); - int start = hook.indexOf("'basemetals_legacy_world_info'"); - int end = hook.indexOf("'basemetals_legacy_chunk_status'"); - String levelHook = hook.substring(start, end); - assertTrue(levelHook.contains("'readLevelDataTagFixed'")); - assertTrue(levelHook.contains("'toFile', '()Ljava/io/File;'")); - assertFalse(levelHook.contains("'getParent'")); - assertTrue(levelHook.contains("'prepareLegacyWorld'")); + String hook = Files.readString(Path.of( + "src/main/java/zone/moddev/mc/basemetals/mixin/LevelStorageSourceMixin.java")); + assertTrue(hook.contains("method = \"readLevelDataTagFixed\"")); + assertTrue(hook.contains("at = @At(\"HEAD\")")); + assertTrue(hook.contains("prepareLegacyWorld(file.toFile())")); + assertTrue(hook.contains("file.getFileName().toString().equals(\"level.dat\")")); + assertFalse(hook.contains("getParent")); } @Test @@ -34,10 +33,10 @@ void obsoleteVanillaBiomeSnapshotIsRemovedWithoutChangingSavedBiomesOrOtherRegis root.put("Data", data); CompoundTag blocks = new CompoundTag(); blocks.putInt("marker", 42); - root.getCompound("fml").getCompound("Registries").put("minecraft:block", blocks); + root.getCompoundOrEmpty("fml").getCompoundOrEmpty("Registries").put("minecraft:block", blocks); assertTrue(LegacyWorldDataHook.removeObsoleteVanillaBiomeSnapshot(root)); - assertEquals(data, root.getCompound("Data")); - assertEquals(blocks, root.getCompound("fml").getCompound("Registries").getCompound("minecraft:block")); + assertEquals(data, root.getCompoundOrEmpty("Data")); + assertEquals(blocks, root.getCompoundOrEmpty("fml").getCompoundOrEmpty("Registries").getCompoundOrEmpty("minecraft:block")); assertFalse(LegacyWorldDataHook.removeObsoleteVanillaBiomeSnapshot(root)); } @@ -53,7 +52,7 @@ void moddedUnknownAndOverriddenBiomeSnapshotsAreNotRemoved() { CompoundTag root = biomeSnapshot("minecraft:plains"); ListTag entries = new ListTag(); entries.add(new CompoundTag()); - root.getCompound("fml").getCompound("Registries").getCompound("minecraft:worldgen/biome").put(list, entries); + root.getCompoundOrEmpty("fml").getCompoundOrEmpty("Registries").getCompoundOrEmpty("minecraft:worldgen/biome").put(list, entries); CompoundTag before = root.copy(); assertFalse(LegacyWorldDataHook.removeObsoleteVanillaBiomeSnapshot(root)); assertEquals(before, root); @@ -83,15 +82,15 @@ private static CompoundTag biomeSnapshot(String... names) { void oldCustomOverworldDimensionsUseTheNativeBiomeSourceReplacement() { CompoundTag root = dimensionFixture("minecraft:vanilla_layered", "minecraft:overworld"); CompoundTag generator = dimensionGenerator(root); - generator.getCompound("biome_source").putBoolean("large_biomes", true); + generator.getCompoundOrEmpty("biome_source").putBoolean("large_biomes", true); assertTrue(LegacyWorldDataHook.migrateRemovedVanillaBiomeSources(root)); - assertEquals("minecraft:multi_noise", generator.getCompound("biome_source").getString("type")); - assertEquals("minecraft:overworld", generator.getCompound("biome_source").getString("preset")); - assertEquals("minecraft:large_biomes", generator.getString("settings")); - assertEquals(1234L, generator.getLong("seed")); - assertEquals("example:overworld", root.getCompound("Data").getCompound("WorldGenSettings") - .getCompound("dimensions").getCompound("example:overworld").getString("type")); + assertEquals("minecraft:multi_noise", generator.getCompoundOrEmpty("biome_source").getStringOr("type", "")); + assertEquals("minecraft:overworld", generator.getCompoundOrEmpty("biome_source").getStringOr("preset", "")); + assertEquals("minecraft:large_biomes", generator.getStringOr("settings", "")); + assertEquals(1234L, generator.getLongOr("seed", 0L)); + assertEquals("example:overworld", root.getCompoundOrEmpty("Data").getCompoundOrEmpty("WorldGenSettings") + .getCompoundOrEmpty("dimensions").getCompoundOrEmpty("example:overworld").getStringOr("type", "")); assertFalse(LegacyWorldDataHook.migrateRemovedVanillaBiomeSources(root)); } @@ -103,7 +102,7 @@ void biomeSourceMigrationLeavesModdedAndModernWorldSettingsAlone() { assertEquals(copy, modded); CompoundTag modern = dimensionFixture("minecraft:vanilla_layered", "minecraft:overworld"); - modern.getCompound("Data").putInt("DataVersion", 2975); + modern.getCompoundOrEmpty("Data").putInt("DataVersion", 2975); assertFalse(LegacyWorldDataHook.migrateRemovedVanillaBiomeSources(modern)); } @@ -131,8 +130,8 @@ private static CompoundTag dimensionFixture(String source, String settings) { } private static CompoundTag dimensionGenerator(CompoundTag root) { - return root.getCompound("Data").getCompound("WorldGenSettings").getCompound("dimensions") - .getCompound("example:overworld").getCompound("generator"); + return root.getCompoundOrEmpty("Data").getCompoundOrEmpty("WorldGenSettings").getCompoundOrEmpty("dimensions") + .getCompoundOrEmpty("example:overworld").getCompoundOrEmpty("generator"); } @Test @@ -146,9 +145,9 @@ void oldWallConnectionsBecomeNativeHeightsWithoutChangingTallConnections() { wall.put("Properties", properties); assertEquals(2, LegacyWorldDataHook.migrateWallStates(wall)); - assertEquals("low", properties.getString("north")); - assertEquals("none", properties.getString("east")); - assertEquals("tall", properties.getString("south")); + assertEquals("low", properties.getStringOr("north", "")); + assertEquals("none", properties.getStringOr("east", "")); + assertEquals("tall", properties.getStringOr("south", "")); assertEquals(0, LegacyWorldDataHook.migrateWallStates(wall)); } @@ -166,7 +165,7 @@ void modernChunkCleanupRemovesOnlyBedsAtBaseMetalsBlocks() { assertEquals(1, LegacyWorldDataHook.removePhantomBedEntities(root)); assertEquals(1, entities.size()); - assertEquals(17, entities.getCompound(0).getInt("y")); + assertEquals(17, entities.getCompoundOrEmpty(0).getIntOr("y", 0)); } @Test @@ -177,7 +176,7 @@ void convertedChunksKeepBelowZeroRetrogen() { root.put("below_zero_retrogen", new CompoundTag()); assertSame(root, LegacyWorldDataHook.finalizeLegacyChunk(root)); - assertEquals("noise", root.getString("Status")); + assertEquals("noise", root.getStringOr("Status", "")); assertFalse(root.contains("BaseMetalsLegacyPreserveChunk")); } @@ -189,14 +188,14 @@ void terrainGuardProtectsSavedChunksButAllowsNewUnderground() throws IOException locations[3] = 1; Files.write(region, locations); assertEquals(1, LegacyWorldDataHook.indexLegacyChunks(world.toFile())); - ResourceLocation overworld = ResourceLocation.parse("minecraft:overworld"); + Identifier overworld = Identifier.parse("minecraft:overworld"); assertTrue(LegacyWorldDataHook.isProtectedChunk(overworld, new BlockPos(1, 0, 1))); assertTrue(LegacyWorldDataHook.isProtectedChunk(overworld, new BlockPos(1, 255, 1))); assertFalse(LegacyWorldDataHook.isProtectedChunk(overworld, new BlockPos(1, -1, 1))); assertFalse(LegacyWorldDataHook.isProtectedChunk(overworld, new BlockPos(1, 256, 1))); assertFalse(LegacyWorldDataHook.isProtectedChunk(overworld, new BlockPos(17, 64, 1))); - assertFalse(LegacyWorldDataHook.isProtectedChunk(ResourceLocation.parse("minecraft:the_nether"), + assertFalse(LegacyWorldDataHook.isProtectedChunk(Identifier.parse("minecraft:the_nether"), new BlockPos(1, 64, 1))); } diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java new file mode 100644 index 000000000..77d5c04b0 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/migration/NativeMigrationHooksTest.java @@ -0,0 +1,77 @@ +package zone.moddev.mc.basemetals.migration; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.lang.reflect.Modifier; +import java.nio.file.Path; + +import com.mojang.datafixers.DataFixer; +import com.mojang.serialization.Dynamic; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.WorldGenRegion; +import net.minecraft.util.datafix.fixes.BlockStateData; +import net.minecraft.world.level.block.AnvilBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.storage.SimpleRegionStorage; +import net.minecraft.world.level.storage.LevelStorageSource; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AnvilMenu; +import net.minecraft.world.level.Level; +import org.junit.jupiter.api.Test; + +/** Catches renamed injection targets before a packaged world is opened. */ +class NativeMigrationHooksTest { + @Test + void levelCaptureStillRunsBeforeVanillaConversion() throws Exception { + var method = LevelStorageSource.class.getDeclaredMethod( + "readLevelDataTagFixed", Path.class, DataFixer.class); + + assertTrue(Modifier.isStatic(method.getModifiers())); + assertEquals(Dynamic.class, method.getReturnType()); + } + + @Test + void chunkAndTerrainTargetsKeepTheirNativeSignatures() throws Exception { + var upgrade = SimpleRegionStorage.class.getDeclaredMethod( + "upgradeChunkTag", CompoundTag.class, int.class, CompoundTag.class); + var write = WorldGenRegion.class.getDeclaredMethod("ensureCanWrite", BlockPos.class); + + assertEquals(CompoundTag.class, upgrade.getReturnType()); + assertEquals(boolean.class, write.getReturnType()); + } + + @Test + void anvilDamageAndLegacyTablesRemainAvailable() throws Exception { + var damage = AnvilBlock.class.getDeclaredMethod("damage", BlockState.class); + + assertTrue(Modifier.isStatic(damage.getModifiers())); + assertEquals(BlockState.class, damage.getReturnType()); + + for (String name : new String[] {"MAP", "BLOCK_DEFAULTS"}) { + var field = BlockStateData.class.getDeclaredField(name); + + assertTrue(Modifier.isStatic(field.getModifiers()), name); + assertEquals(Dynamic[].class, field.getType(), name); + } + } + + @Test + void capabilityHookTargetsOnlyForgesWorldDataCodec() throws Exception { + var factory = net.minecraftforge.common.util.LevelCapabilityData.class.getDeclaredMethod( + "type", net.minecraft.server.level.ServerLevel.class); + + assertTrue(Modifier.isStatic(factory.getModifiers())); + assertEquals(net.minecraft.world.level.saveddata.SavedDataType.class, factory.getReturnType()); + } + + @Test + void anvilWearHookTargetsOnlyTheNativeTakeCallback() throws Exception { + var callback = AnvilMenu.class.getDeclaredMethod( + "lambda$onTake$2", Player.class, float.class, Level.class, BlockPos.class); + + assertTrue(Modifier.isStatic(callback.getModifiers())); + assertEquals(void.class, callback.getReturnType()); + } +} 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 9f53f7b0d..387dfa1ea 100644 --- a/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java @@ -10,8 +10,9 @@ class ConnectionReadInterestTest { @Test void obsoleteConnectionPatchIsNotInstalled() throws Exception { assertFalse(Files.exists(Path.of("src/main/resources/coremods/connection_read_interest.js"))); - String coremods = Files.readString(Path.of("src/main/resources/META-INF/coremods.json")); - assertFalse(coremods.contains("connection_read_interest")); + assertFalse(Files.exists(Path.of("src/main/resources/META-INF/coremods.json"))); + String mixins = Files.readString(Path.of("src/main/resources/basemetals.mixins.json")); + assertFalse(mixins.contains("Connection")); } @Test 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 0078e38cd..e6e7679e5 100644 --- a/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java +++ b/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java @@ -20,7 +20,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.EquipmentSlot; @@ -34,12 +34,12 @@ import net.minecraft.world.level.storage.LevelResource; import net.minecraft.world.phys.AABB; import net.minecraftforge.event.server.ServerStartedEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; /** Validation-only reader for captured legacy Forge upgrade fixtures and worlds. */ -@Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID) +@Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class UpgradeWorldSmoke { private static final String ENABLED_PROPERTY = "basemetals.upgradeWorldSmoke"; private static final String LEGACY_WORLD_PROPERTY = "basemetals.legacyWorldSmoke"; @@ -47,10 +47,23 @@ public final class UpgradeWorldSmoke { private static ServerStartedEvent pending; private static int waitTicks; private static boolean equipmentReady; + private static boolean registered; private UpgradeWorldSmoke() {} @SubscribeEvent + public static void setup(net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent event) { + register(); + } + + public static void register() { + if (!registered) { + ServerStartedEvent.BUS.addListener(UpgradeWorldSmoke::onServerStarted); + net.minecraftforge.event.TickEvent.ServerTickEvent.Post.BUS.addListener(UpgradeWorldSmoke::onServerTick); + registered = true; + } + } + public static void onServerStarted(ServerStartedEvent event) { boolean fixture = Boolean.getBoolean(ENABLED_PROPERTY); boolean legacyWorld = Boolean.getBoolean(LEGACY_WORLD_PROPERTY); @@ -143,8 +156,8 @@ public static void onServerStarted(ServerStartedEvent event) { int expectedCount = oldItem.has("count") ? oldItem.get("count").getAsInt() : 1; int expectedDamage = oldItem.has("damage") ? oldItem.get("damage").getAsInt() : 0; boolean proofMatches = format < 2 || stack.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()); + net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompoundOrEmpty("basemetals_fixture") + .getStringOr("proof", "").equals(oldItem.get("id").getAsString()); boolean enchantmentMatches = !oldItem.has("enchanted") || !oldItem.get("enchanted").getAsBoolean() || EnchantmentHelper.getItemEnchantmentLevel(unbreaking, stack) == 2; if (!expected.equals(actual) || stack.getCount() != expectedCount @@ -166,15 +179,15 @@ public static void onServerStarted(ServerStartedEvent event) { (int) Math.floor(oldItem.get("armor_z").getAsDouble())); overworld.getChunkAt(armorPos); List stands = overworld.getEntitiesOfClass(ArmorStand.class, - new AABB(armorPos.getX() - 0.75D, overworld.getMinBuildHeight(), armorPos.getZ() - 0.75D, - armorPos.getX() + 1.75D, overworld.getMaxBuildHeight(), armorPos.getZ() + 1.75D)); + new AABB(armorPos.getX() - 0.75D, overworld.getMinY(), armorPos.getZ() - 0.75D, + armorPos.getX() + 1.75D, overworld.getMaxY(), armorPos.getZ() + 1.75D)); EquipmentSlot equipmentSlot = EquipmentSlot.byName(oldItem.get("armor_slot").getAsString()); boolean equipped = stands.stream().anyMatch(stand -> { ItemStack worn = stand.getItemBySlot(equipmentSlot); return expected.equals(String.valueOf(ForgeRegistries.ITEMS.getKey(worn.getItem()))) && worn.getDamageValue() == expectedDamage && worn.getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, - net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompound("basemetals_fixture").getString("proof") + net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompoundOrEmpty("basemetals_fixture").getStringOr("proof", "") .equals(oldItem.get("id").getAsString()) && EnchantmentHelper.getItemEnchantmentLevel(unbreaking, worn) == 2; }); @@ -216,19 +229,22 @@ public static void onServerStarted(ServerStartedEvent event) { ServerPlayer player = new ServerPlayer(event.getServer(), overworld, new GameProfile(UUID.fromString(savedPlayer.get("uuid").getAsString()), name), net.minecraft.server.level.ClientInformation.createDefault()); - CompoundTag loaded = event.getServer().getPlayerList().load(player).orElse(null); + CompoundTag loaded = event.getServer().getPlayerList().loadPlayerData( + new net.minecraft.server.players.NameAndId(player.getGameProfile())).orElse(null); if (loaded == null) { failures.add("fixture playerdata did not load"); continue; } + player.load(net.minecraft.world.level.storage.TagValueInput.create( + net.minecraft.util.ProblemReporter.DISCARDING, overworld.registryAccess(), loaded)); for (JsonElement inventoryElement : savedPlayer.getAsJsonArray("inventory")) { JsonObject expectedItem = inventoryElement.getAsJsonObject(); int slot = expectedItem.get("slot").getAsInt(); ItemStack stack = player.getInventory().getItem(slot); String expected = currentItemId(expectedItem.get("id").getAsString()); boolean proof = stack.getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, - net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompound("basemetals_fixture") - .getString("player_proof").equals(expectedItem.get("id").getAsString()); + net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompoundOrEmpty("basemetals_fixture") + .getStringOr("player_proof", "").equals(expectedItem.get("id").getAsString()); if (!expected.equals(String.valueOf(ForgeRegistries.ITEMS.getKey(stack.getItem()))) || !proof) { if (itemMismatches < 10) failures.add("player slot " + slot + " lost " + expected); @@ -290,9 +306,8 @@ private static void prepareEquipmentChunks(ServerStartedEvent event) { } } - @SubscribeEvent - public static void onServerTick(net.minecraftforge.event.TickEvent.ServerTickEvent event) { - if (event.phase != net.minecraftforge.event.TickEvent.Phase.END || pending == null || ++waitTicks < 20) return; + public static void onServerTick(net.minecraftforge.event.TickEvent.ServerTickEvent.Post event) { + if (pending == null || ++waitTicks < 20) return; var server = pending.getServer(); boolean loaded = equipmentChunks.stream().allMatch(chunk -> server.overworld().areEntitiesLoaded(chunk.toLong())); if (!loaded && waitTicks < 200) return; @@ -316,7 +331,7 @@ private static void verifySavedAdvancements(net.minecraft.server.MinecraftServer int retained = 0; for (var entry : fixture.getAsJsonObject("progress").entrySet()) { if ("DataVersion".equals(entry.getKey())) continue; - var advancement = server.getAdvancements().get(ResourceLocation.parse(entry.getKey())); + var advancement = server.getAdvancements().get(Identifier.parse(entry.getKey())); if (advancement == null) throw new IllegalStateException("Saved advancement missing: " + entry.getKey()); var progress = player.getAdvancements().getOrStartProgress(advancement); if (!progress.isDone()) throw new IllegalStateException("Saved advancement is incomplete: " + entry.getKey()); @@ -367,7 +382,7 @@ private static ServerLevel level(ServerStartedEvent event, int dimension) { } private static String currentBlockId(String legacy) { - ResourceLocation id = ResourceLocation.parse(legacy.toLowerCase(java.util.Locale.ROOT)); + Identifier id = Identifier.parse(legacy.toLowerCase(java.util.Locale.ROOT)); if (id.getNamespace().equals("mmdlib") || id.getNamespace().equals(BaseMetals.MOD_ID)) { return BaseMetals.MOD_ID + ":" + MissingMappings.blockTargetPath(id.getPath()); } @@ -375,7 +390,7 @@ private static String currentBlockId(String legacy) { } private static String currentItemId(String legacy) { - ResourceLocation id = ResourceLocation.parse(legacy.toLowerCase(java.util.Locale.ROOT)); + Identifier id = Identifier.parse(legacy.toLowerCase(java.util.Locale.ROOT)); if (id.getNamespace().equals("mmdlib") || id.getNamespace().equals(BaseMetals.MOD_ID)) { return MissingMappings.itemTargetId(id.getPath()).toString(); } diff --git a/tools/validation/README.md b/tools/validation/README.md index 13982d99c..4bca17e28 100644 --- a/tools/validation/README.md +++ b/tools/validation/README.md @@ -1,9 +1,11 @@ # World upgrade checks -`test_legacy_worlds.js` starts the packaged Forge 1.21.1 server against a fresh +`test_legacy_worlds.js` starts the packaged Forge 1.21.11 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. +An optional `forgeVersion` selects another installed Forge 1.21.11 build for +compatibility checks; the default is the compilation target, `61.1.0`. Pass a local JSON specification containing `java` (the Java 21 executable), `serverRuntime`, `output`, `modJar`, `probeJar`, `oreSpawn` (a `path` and `sha256`), and a `profiles` list. @@ -26,6 +28,8 @@ 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. +Exposed dirt may become grass only when grass was already growing beside it; +buried changes and new ore in saved terrain still fail the comparison. It needs the Python `nbtlib` package. Run `test_world_terrain.py` to check the palette readers and falling-block comparison. diff --git a/tools/validation/compare_current_world.py b/tools/validation/compare_current_world.py index 2b9ce4eee..a2768a9f1 100644 --- a/tools/validation/compare_current_world.py +++ b/tools/validation/compare_current_world.py @@ -40,14 +40,30 @@ def ordered(tag): def canonical_text(value): - text = str(value) - try: - parsed = json.loads(text) - except (ValueError, TypeError): - parsed = text + if isinstance(value, (nbtlib.Compound, nbtlib.List)): + parsed = value.unpack(json=True) + else: + text = str(value) + try: + parsed = json.loads(text) + except (ValueError, TypeError): + parsed = text + if isinstance(parsed, str): parsed = {"text": parsed} - return nbtlib.String(json.dumps(parsed, sort_keys=True, separators=(",", ":"))) + + def styles(component): + if isinstance(component, dict): + result = {} + boolean_styles = {"bold", "italic", "underlined", "strikethrough", "obfuscated"} + for key, child in component.items(): + result[key] = bool(child) if key in boolean_styles and isinstance(child, int) else styles(child) + return result + if isinstance(component, list): + return [styles(child) for child in component] + return component + + return nbtlib.String(json.dumps(styles(parsed), sort_keys=True, separators=(",", ":"))) def canonical_stack(stack): @@ -83,6 +99,9 @@ def canonical_stack(stack): components[new] = nbtlib.Compound({"levels": levels}) if new in components: enchantments = components[new] + if "levels" not in enchantments: + enchantments = nbtlib.Compound({"levels": enchantments}) + components[new] = enchantments if bool(enchantments.get("show_in_tooltip", False)): enchantments.pop("show_in_tooltip") if not enchantments.get("levels"): @@ -95,6 +114,16 @@ def canonical_stack(stack): return ordered(result).snbt() +def canonical_player(player): + """Keep worn slots comparable after Minecraft moves them out of Inventory.""" + result = copy.deepcopy(player) + slots = {"feet": 100, "legs": 101, "chest": 102, "head": 103, "offhand": -106} + for name, stack in result.get("equipment", {}).items(): + if name in slots and isinstance(stack, nbtlib.Compound): + stack["Slot"] = nbtlib.Byte(slots[name]) + return result + + def snapshot(world): blocks = {} stacks = Counter() @@ -140,9 +169,9 @@ def items(value): for entity in saved_entities(world): items(entity) - items(nbtlib.load(world / "level.dat")["Data"].get("Player", {})) + items(canonical_player(nbtlib.load(world / "level.dat")["Data"].get("Player", {}))) for player in (world / "playerdata").glob("*.dat"): - items(nbtlib.load(player)) + items(canonical_player(nbtlib.load(player))) advancements = {} for file in (world / "advancements").glob("*.json"): diff --git a/tools/validation/compare_world_terrain.py b/tools/validation/compare_world_terrain.py index 9987fba44..4acf7c9c3 100644 --- a/tools/validation/compare_world_terrain.py +++ b/tools/validation/compare_world_terrain.py @@ -173,12 +173,43 @@ def assign(source, visited): def compare(original, upgraded): before, after = chunks(original), chunks(upgraded) + decoded_sections = {} + + def block_at(world, dimension, x, y, z): + key = (dimension, x >> 4, z >> 4) + section_y = y >> 4 + cache_key = (id(world), key, section_y) + if cache_key not in decoded_sections: + chunk = world.get(key, {}) + sections = chunk.get("Sections", chunk.get("sections", [])) + section = next((entry for entry in sections if int(entry["Y"]) == section_y), None) + decoded_sections[cache_key] = list(block_names(section)) if section is not None else [None] * 4096 + index = ((y & 15) << 8) | ((z & 15) << 4) | (x & 15) + return decoded_sections[cache_key][index] + + def natural_grass_growth(dimension, x, y, z): + if block_at(before, dimension, x, y + 1, z) not in AIR: + return False + if block_at(after, dimension, x, y + 1, z) not in AIR: + return False + + # Grass can spread from an exposed neighbour, but never turn buried dirt or rock into grass. + for dx in range(-1, 2): + for dz in range(-1, 2): + for dy in range(-1, 4): + neighbour = block_at(before, dimension, x + dx, y + dy, z + dz) + above = block_at(before, dimension, x + dx, y + dy + 1, z + dz) + if neighbour == "minecraft:grass_block" and above in AIR: + return True + return False + original_drops, current_drops = [], [] falling_blocks(original, before, original_drops) current_falling = falling_blocks(upgraded, after, current_drops) old_drop_ids = {drop["uuid"] for drop in original_drops} current_drops = [drop for drop in current_drops if drop["uuid"] not in old_drop_ids] checked = 0 + grass_updates = 0 missing, recovered = [], [] for (dimension, chunk_x, chunk_z, column), entries in current_falling.items(): @@ -217,6 +248,10 @@ def compare(original, upgraded): continue checked += 1 if actual[index] != expected: + if (expected == "minecraft:dirt" and actual[index] == "minecraft:grass_block" + and natural_grass_growth(key[0], math.floor(x), y, math.floor(z))): + grass_updates += 1 + continue # Vanilla replaces the old Overworld floor when it opens the new underground. if (key[0] == "" and 0 <= y <= 4 and lowest_section < 0 and expected == "minecraft:bedrock" and actual[index] == "minecraft:deepslate"): @@ -231,7 +266,7 @@ def compare(original, upgraded): match_fallen_blocks(missing, recovered) print(f"TERRAIN_UPGRADE PASS chunks={len(before)} solid_blocks={checked} " - f"recovered_falling_blocks={len(missing)}") + f"recovered_falling_blocks={len(missing)} natural_grass_updates={grass_updates}") if __name__ == "__main__": diff --git a/tools/validation/test_component_comparison.py b/tools/validation/test_component_comparison.py index 5ca6f8159..c1b7c014a 100644 --- a/tools/validation/test_component_comparison.py +++ b/tools/validation/test_component_comparison.py @@ -3,10 +3,21 @@ import copy import unittest import nbtlib -from compare_current_world import canonical_stack +from compare_current_world import canonical_player, canonical_stack class ComponentComparisonTest(unittest.TestCase): + def test_player_armour_keeps_its_slot_in_native_equipment(self): + older = nbtlib.parse_nbt('{Slot:100b,id:"basemetals:adamantine_boots",Count:1b}') + current = nbtlib.parse_nbt('{equipment:{feet:{id:"basemetals:adamantine_boots",count:1}}}') + normalized = canonical_player(current) + self.assertEqual(canonical_stack(older), canonical_stack(normalized['equipment']['feet'])) + self.assertNotIn('Slot', current['equipment']['feet']) + + wrong_slot = nbtlib.parse_nbt('{equipment:{head:{id:"basemetals:adamantine_boots",count:1}}}') + self.assertNotEqual(canonical_stack(older), + canonical_stack(canonical_player(wrong_slot)['equipment']['head'])) + def test_legacy_data_equals_its_native_components(self): legacy = nbtlib.parse_nbt('''{id:"basemetals:steel_sword",Count:1b,Slot:2b,tag:{ Damage:19,display:{Name:'{"text":"Old sword"}',Lore:['{"text":"A keepsake"}']}, @@ -26,6 +37,26 @@ def test_unknown_component_and_custom_nbt_are_not_ignored(self): changed = nbtlib.parse_nbt('{id:"basemetals:steel_arrow",count:1,components:{"example:data":{value:9}}}') self.assertNotEqual(canonical_stack(original), canonical_stack(changed)) + def test_native_text_and_flat_enchantment_maps_keep_their_data(self): + older = nbtlib.parse_nbt('''{id:"basemetals:steel_sword",count:1,components:{ + "minecraft:custom_name":'{"text":"Old sword","color":"gold","bold":true}', + "minecraft:lore":['{"text":"A keepsake"}'], + "minecraft:enchantments":{levels:{"minecraft:unbreaking":2}}}}''') + current = nbtlib.parse_nbt('''{id:"basemetals:steel_sword",count:1,components:{ + "minecraft:custom_name":{text:"Old sword",color:"gold",bold:1b}, + "minecraft:lore":[{text:"A keepsake"}], + "minecraft:enchantments":{"minecraft:unbreaking":2}}}''') + self.assertEqual(canonical_stack(older), canonical_stack(current)) + + for key in current['components']: + changed = copy.deepcopy(current) + changed['components'].pop(key) + self.assertNotEqual(canonical_stack(older), canonical_stack(changed), key) + + changed = copy.deepcopy(current) + changed['components']['minecraft:custom_name']['color'] = nbtlib.String('red') + self.assertNotEqual(canonical_stack(older), canonical_stack(changed)) + if __name__ == '__main__': unittest.main() diff --git a/tools/validation/test_content_modes.js b/tools/validation/test_content_modes.js index cfb21ff78..05be044a1 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.21.1', '52.1.0'); + const client = clientLaunch(spec.clientRuntime, '1.21.11', '61.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.21.1', '52.1.0')], 'server.log'); + ...serverArguments(spec.serverRuntime, serverDir, '1.21.11', '61.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.21.1', '--gameDir', clientDir, + '--username', 'BMValidation', '--version', '1.21.11', '--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 24f7f7168..1c0b7a9d3 100644 --- a/tools/validation/test_legacy_worlds.js +++ b/tools/validation/test_legacy_worlds.js @@ -68,6 +68,9 @@ function prepare(directory, runtime, launcher, mods) { function checkUpgradeLog(log) { // Forge reports these removed vanilla names when it reads an older registry snapshot. const retiredVanillaEntries = new Set([ + // Vanilla split boats by wood type and thrown potions by potion type. + 'minecraft:boat', 'minecraft:chest_boat', 'minecraft:potion', + 'minecraft:chain', 'minecraft:grass_path', // These names were changed by vanilla's 1.20.5 data fixes. 'minecraft:grass', 'minecraft:scute', 'minecraft:sweeping', 'minecraft:empty', @@ -83,6 +86,9 @@ function checkUpgradeLog(log) { 'minecraft:music.overworld.jungle_and_forest', 'minecraft:entity.zombie_pigman.ambient', 'minecraft:entity.zombie_pigman.angry', 'minecraft:entity.zombie_pigman.death', 'minecraft:entity.zombie_pigman.hurt', + 'minecraft:entity.leash_knot.break', 'minecraft:entity.leash_knot.place', + 'minecraft:entity.puffer_fish.ambient', 'minecraft:entity.wolf.howl', + 'minecraft:entity.goat.screaming.horn_break', 'minecraft:item.goat_horn.play', 'minecraft:music.nether', 'minecraft:item.sweet_berries.pick_from_bush' ]); // Minecraft's Caves and Cliffs data fix folds these biomes into their new names. @@ -114,14 +120,13 @@ function checkUpgradeLog(log) { 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 => [ + const knownVanillaNames = entries.length > 0 && entries.every(entry => + retiredVanillaEntries.has(entry) || registry === 'minecraft:sound_event' && [ '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))) { + if (knownPaintingSnapshot || knownVanillaNames) { entries.forEach(entry => acceptedEntries.add(entry)); continue; } @@ -143,7 +148,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.21.1', '52.1.0'); + : serverArguments(spec.serverRuntime, directory, '1.21.11', spec.forgeVersion || '61.1.0'); const child = spawn(executable, ['-Xms256m', '-Xmx2g', ...properties, ...launchArguments], { cwd: directory, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }); child.stdout.pipe(output, { end: false }); diff --git a/tools/validation/test_world_terrain.py b/tools/validation/test_world_terrain.py index 562710f78..df8f16856 100644 --- a/tools/validation/test_world_terrain.py +++ b/tools/validation/test_world_terrain.py @@ -41,6 +41,41 @@ def gravel(x=0.5, y=35, z=0.5, dimension=""): class FallingTerrainTest(unittest.TestCase): + def test_exposed_dirt_beside_old_grass_can_grow_normally(self): + self.compare_surface("minecraft:dirt", "minecraft:grass_block", nearby_grass=True) + + def test_grass_does_not_excuse_buried_or_isolated_changes(self): + for buried, nearby in [(True, True), (False, False)]: + with self.assertRaisesRegex(AssertionError, "dirt became minecraft:grass_block"): + self.compare_surface("minecraft:dirt", "minecraft:grass_block", nearby, buried) + + def test_surface_growth_never_excuses_changed_rock_or_new_ore(self): + for original, changed in [("minecraft:stone", "minecraft:grass_block"), + ("minecraft:dirt", "basemetals:tin_ore")]: + with self.assertRaises(AssertionError): + self.compare_surface(original, changed, nearby_grass=True) + + def compare_surface(self, original, changed, nearby_grass, buried=False): + values = ["minecraft:air"] * 4096 + values[0] = original + if nearby_grass: + values[1] = "minecraft:grass_block" + if buried: + values[256] = "minecraft:stone" + after = values.copy() + after[0] = changed + + def chunk(blocks): + return {("", 0, 0): {"Sections": [{"Y": 0, "values": blocks, + "Palette": [{"Name": "minecraft:dirt"}, {"Name": "minecraft:stone"}]}]}} + + with ( + patch.object(terrain, "chunks", side_effect=[chunk(values), chunk(after)]), + patch.object(terrain, "block_names", side_effect=lambda section: iter(section["values"])), + patch.object(terrain, "falling_blocks", return_value={}), + ): + terrain.compare(Path("source"), Path("copy")) + def test_identical_sections_still_count_every_solid_block(self): chunks = {("", 0, 0): {"Sections": [{"Y": 0, "Palette": [{"Name": "minecraft:stone"}]}]}} with (