diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d8ad250b..c46143bc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,19 @@ -name: Base Metals 1.20.1 CI +name: Base Metals 1.20.6 CI on: push: branches: - - master-1.20.1 + - master-1.20.6 - 'feature/**' pull_request: branches: - - master-1.20.1 + - master-1.20.6 permissions: contents: read concurrency: - group: basemetals-1.20.1-${{ github.workflow }}-${{ github.ref }} + group: basemetals-1.20.6-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -26,11 +26,23 @@ jobs: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - name: Install pinned Java 17 runtime and toolchain + - name: Install Java 25 for Mavenizer uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '17.0.1+12' + java-version: '25.0.3+9.0.LTS' + + - name: Install Java 8 for the development launcher helper + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '8.0.502+7' + + - name: Install pinned Java 21 runtime and toolchain + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '21.0.7+6.0.LTS' - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 @@ -42,6 +54,12 @@ jobs: bash gradle/stage-orespawn-release.sh "$mirror" echo "repository=$mirror" >> "$GITHUB_OUTPUT" + - name: Test saved-item component comparisons + run: | + python3 -m venv "$RUNNER_TEMP/nbt-tests" + "$RUNNER_TEMP/nbt-tests/bin/pip" install nbtlib==2.0.4 numpy==2.4.6 + "$RUNNER_TEMP/nbt-tests/bin/python" -m unittest discover -s tools/validation -p 'test_*.py' + - name: Build, test, and audit first candidate run: | chmod +x ./gradlew @@ -50,9 +68,9 @@ jobs: --no-daemon --stacktrace first="$RUNNER_TEMP/basemetals-first" mkdir -p "$first" - cp build/libs/BaseMetals-3.1.0.120011.jar "$first/" - cp build/libs/BaseMetals-3.1.0.120011-sources.jar "$first/" - cp build/libs/BaseMetals-3.1.0.120011-javadoc.jar "$first/" + cp build/libs/BaseMetals-3.1.0.120061.jar "$first/" + cp build/libs/BaseMetals-3.1.0.120061-sources.jar "$first/" + cp build/libs/BaseMetals-3.1.0.120061-javadoc.jar "$first/" cp build/release/SHA256SUMS "$first/" - name: Rebuild and prove byte-identical archives @@ -60,9 +78,9 @@ jobs: ./gradlew clean assemble verifyReleaseArtifacts writeReleaseChecksums \ -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ --no-daemon --stacktrace - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120011.jar" build/libs/BaseMetals-3.1.0.120011.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120011-sources.jar" build/libs/BaseMetals-3.1.0.120011-sources.jar - cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120011-javadoc.jar" build/libs/BaseMetals-3.1.0.120011-javadoc.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120061.jar" build/libs/BaseMetals-3.1.0.120061.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120061-sources.jar" build/libs/BaseMetals-3.1.0.120061-sources.jar + cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.120061-javadoc.jar" build/libs/BaseMetals-3.1.0.120061-javadoc.jar cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS - name: Run all required GameTests @@ -74,14 +92,14 @@ jobs: - name: Install official Forge packaged runtimes id: forge-runtimes run: | - server_runtime="$RUNNER_TEMP/forge-1.20.1-47.4.10-server" - client_runtime="$RUNNER_TEMP/forge-1.20.1-47.4.10-client" - installer="$RUNNER_TEMP/forge-1.20.1-47.4.10-installer.jar" + server_runtime="$RUNNER_TEMP/forge-1.20.6-50.2.0-server" + client_runtime="$RUNNER_TEMP/forge-1.20.6-50.2.0-client" + installer="$RUNNER_TEMP/forge-1.20.6-50.2.0-installer.jar" mkdir -p "$server_runtime" "$client_runtime" curl --fail --location --retry 3 \ --output "$installer" \ - https://maven.minecraftforge.net/net/minecraftforge/forge/1.20.1-47.4.10/forge-1.20.1-47.4.10-installer.jar - echo "1912760B4CB6B803D8A826DE603C9076B1DA71EC2765E9A1F8C1CA78F65278E3 $installer" | sha256sum --check --strict + https://maven.minecraftforge.net/net/minecraftforge/forge/1.20.6-50.2.0/forge-1.20.6-50.2.0-installer.jar + echo "8789098B077F5486449311A11DC05E977FEB9430913CB15F30B21A2D8AA213EA $installer" | sha256sum --check --strict ( cd "$server_runtime" java -jar "$installer" --installServer @@ -124,13 +142,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.20.1-${{ github.sha }} + name: BaseMetals-1.20.6-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/BaseMetals-3.1.0.120011.jar - build/libs/BaseMetals-3.1.0.120011-sources.jar - build/libs/BaseMetals-3.1.0.120011-javadoc.jar + build/libs/BaseMetals-3.1.0.120061.jar + build/libs/BaseMetals-3.1.0.120061-sources.jar + build/libs/BaseMetals-3.1.0.120061-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -138,7 +156,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: BaseMetals-1.20.1-diagnostics-${{ github.sha }} + name: BaseMetals-1.20.6-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 a1a0092f8..6b5328052 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.20.1 + - master-1.20.6 - 'feature/**' pull_request: branches: - - master-1.20.1 + - master-1.20.6 permissions: actions: read @@ -24,11 +24,23 @@ jobs: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - name: Install pinned Java 17 runtime and toolchain + - name: Install Java 25 for Mavenizer uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '17.0.1+12' + java-version: '25.0.3+9.0.LTS' + + - name: Install Java 8 for the development launcher helper + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '8.0.502+7' + + - name: Install pinned Java 21 runtime and toolchain + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '21.0.7+6.0.LTS' - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml index 63abc33fb..2c47d1281 100644 --- a/.github/workflows/validate-gradle-build.yml +++ b/.github/workflows/validate-gradle-build.yml @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper on: push: branches: - - master-1.20.1 + - master-1.20.6 - 'feature/**' pull_request: branches: - - master-1.20.1 + - master-1.20.6 permissions: contents: read diff --git a/.gitignore b/.gitignore index 378855845..23395891c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ out *.iws *.iml .idea +.run/ # gradle build diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f6b1a1958..796cb2ceb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,15 @@ +Base Metals 3.1.0.120061 + +- Port the released 1.20.1 version to Minecraft 1.20.6, Forge 50.2.0 and Java 21. +- Keep raw metals, Kiri's ore overlays, filled buckets, High/Low Fantasy and the existing gameplay fixes. +- Update equipment, item data, recipes, trades and loot for the new component and codec APIs. +- Check client and server content modes during Forge's configuration phase before joining a world. +- Keep names, enchantments and custom data when repairing or upgrading equipment. +- Retain saved arrow and bolt ammunition through the item-data conversion. +- Use the published OreSpawn 4.1.0.120061 release with the same provider rules and copper defaults. +- Retain compatible integration data without loading unsupported optional-mod jars. +- Keep the port's worlds, test probes and development output separate from public jars. + Base Metals 3.1.0.120011 - Port the 1.19.4 version to Minecraft 1.20.1 and Forge 47.4.10. diff --git a/README.md b/README.md index 1a4aeadf5..a62c98279 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) [![CurseForge downloads](https://cf.way2muchnoise.eu/full_base-metals_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) [![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_base-metals_all.svg)](https://www.curseforge.com/minecraft/mc-mods/base-metals) -[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-1.20.1)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.20.1) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml/badge.svg?branch=master-1.20.6)](https://github.com/MinecraftModDevelopmentMods/BaseMetals/actions/workflows/ci.yml?query=branch%3Amaster-1.20.6) # Base Metals @@ -12,21 +12,21 @@ shields, bows, crossbows, arrows, and bolts. The mod also includes Crack Hammers, scythes, metal anvils, the human detector, villager trades, advancements, and structure loot. -This is the Minecraft 1.20.1 Forge version, `3.1.0.120011`. It keeps the -fixes and features from 1.19.4, including raw metals, ore texture +This is the Minecraft 1.20.6 Forge version, `3.1.0.120061`. It keeps the +fixes and features from the released 1.20.1 version, including raw metals, ore texture overlays and High/Low Fantasy modes. Existing Base Metals items and blocks keep their registry IDs. OreSpawn handles ore generation; MMDLib and Additional Loot Tables are no longer needed. ## Requirements -- Minecraft `1.20.1` -- Forge `47.4.10` or newer in the Minecraft 1.20.1 Forge 47 line -- A current Java 17 runtime -- OreSpawn `[4.1.0.120011,5.0.0)` on both client and server +- Minecraft `1.20.6` +- Forge `50.2.0` or newer in the Minecraft 1.20.6 Forge 50 line +- A current Java 21 runtime +- OreSpawn `[4.1.0.120061,5.0.0)` on both client and server -This version uses OreSpawn `4.1.0.120011`. Put -`BaseMetals-3.1.0.120011.jar` and a compatible OreSpawn JAR in the `mods` +This version uses OreSpawn `4.1.0.120061`. Put +`BaseMetals-3.1.0.120061.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. @@ -58,7 +58,7 @@ Notable mechanics include: - Scythes harvest a horizontal 3x3 area while respecting normal Forge block break and protection events, drops, enchantments, and durability. - Material shields can be upgraded at an anvil with one strictly harder tagged - plate while retaining their enchantments. + plate while retaining their enchantments, name and other item data. - Bows fire arrows, while Base Metals' draw-and-release crossbows fire bolts. Both the weapon and ammunition material contribute to the damage, before enchantment bonuses. Picked-up projectiles keep their material and item data. @@ -134,13 +134,13 @@ original. Read [Migration](docs/MIGRATION.md) before starting an upgraded world. Forge item, block, and fluid tags are Base Metals' public compatibility API. -Integration data is included for Mekanism, Thermal Expansion, Tinkers' Construct -and Ender IO. These mods are optional. Use their Minecraft 1.20.1 builds; jars -for other Minecraft versions cannot be substituted. +Compatible tags and the existing recipe data for Mekanism, Thermal, Tinkers' +Construct and Ender IO are retained, but these integrations are not supported +on this target: those mods do not publish Forge 1.20.6 builds. Their older jars +must not be added to this instance. No optional integration API is required to +compile or launch Base Metals. -The normal development client loads only Base Metals and OreSpawn. Use the -separate optional-mod client profile when working on integrations. Its exact -dependencies and checksums are listed in `gradle/optional-mods.json`. +The normal development client loads only Base Metals and OreSpawn. See [Compatibility](docs/COMPATIBILITY.md) for the supported processing chains, tag aliases, copper rules, and intentionally retired legacy integrations. See @@ -150,8 +150,9 @@ contracts. ## Building and contributing Base Metals uses ForgeGradle `7.0.34`, Gradle `9.6.1`, official Minecraft -mappings, and the Java 17 toolchain. Initial Minecraft setup also uses Java 25 -for Mavenizer; Minecraft and the mod still run on Java 17. A normal command-line +mappings, and the Java 21 toolchain. Initial Minecraft setup also uses Java 25 +for Mavenizer. ForgeGradle also needs Java 8 for its setup helper; it does not +compile the mod or run Minecraft with Java 8. A normal command-line build resolves the published OreSpawn release from CurseMaven: ```text @@ -161,15 +162,16 @@ build resolves the published OreSpawn release from CurseMaven: Generate and verify Eclipse launches with: ```text -./gradlew genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath +./gradlew prepareEclipse ``` +IntelliJ users can import the Gradle project with Java 21 and run +`./gradlew prepareIntelliJ` to add client and server configurations. Both IDEs +use the same Gradle-managed Forge bootstrap and assets. + Use **runClient** for normal testing with Base Metals and OreSpawn only. -**runClientOptionalMods** uses a separate `run-optional-mods` folder for -compatibility testing with Mekanism, Mantle, Tinkers' Construct and CoFH Core. -Thermal and Ender IO are tested with packaged jars instead: their embedded -dependencies cannot be remapped by the development launcher. -Both profiles are available in Eclipse and through Gradle tasks. +The optional-mod profile uses a separate folder, but currently has no additional +mods on this target. Both profiles are available in Eclipse and through Gradle tasks. Use the Gradle **generateResources** task when changing recipes, models or translations. It updates the checked-in data; ordinary builds only check for @@ -183,7 +185,7 @@ artifacts. GameTests, smoke probes, migration fixtures, and reference sources are isolated from the published JAR. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.0.120011`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.0.120061`. 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 169c10011..b0ef12d73 100644 --- a/build.gradle +++ b/build.gradle @@ -3,19 +3,18 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.minecraftforge.renamer' version '1.1.5' id 'net.minecraftforge.gradle' version '7.0.34' } ext.mavenizerCompatibilityJar = layout.projectDirectory.file( 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar') ext.mavenizerCompatibilitySha256 = - '416DCA4797BC55826F0DDCF03FDC405F1990FC15C2133FA27A1F143BF7976177' + '4B14145595E900F178A082F2253A756F63897E6F61C2B8B5E7C819B82CD79E8C' ext.mavenizerFixtureChecksums = [ 'minecraft-mavenizer-0.5.21-orespawn-compat.jar': mavenizerCompatibilitySha256, - 'minecraft-source-compatibility.json': '8945511DFF53B8F1A91EE44B14AF9EC7DB34C373617EA37A608C6958BFEEB22E', - 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': 'D856190DEF5574716C5E4F4379912C451B1F5952B0B111576651A98EECF58544', + 'minecraft-source-compatibility.json': '931DAB31C238D8C9C38239671A61DA0942ADADF80149D6359197EE80A16380A8', + 'minecraft-mavenizer-0.5.21-orespawn-compat.patch': 'A140C21312C2A5A8AFC56DC0B037B94D222CA68A7B868512B91684CD3754B650', 'LICENSE-MAVENIZER.txt': '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331' ] // Mavenizer runs during configuration, so verify its inputs before configuring Forge. @@ -27,8 +26,8 @@ mavenizerFixtureChecksums.each { name, expected -> } } -// OreSpawn's sealed Mavenizer fixture fixes duplicate record accessors in -// Forge 47's decompiled sources. It is build tooling, not part of the mod. +// Forge 50 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) mainClass.set('net.minecraftforge.mcmaven.cli.Main') @@ -67,7 +66,7 @@ ext.release_tag = project.mod_version java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) vendor = JvmVendorSpec.ADOPTIUM } withSourcesJar() @@ -76,11 +75,11 @@ java { tasks.withType(JavaCompile).configureEach { javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) vendor = JvmVendorSpec.ADOPTIUM } - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 options.encoding = 'UTF-8' options.compilerArgs.addAll(['-Xmaxerrs', '1000']) } @@ -338,6 +337,16 @@ tasks.withType(JavaExec).configureEach { JavaExec runTask -> runTask.dependsOn selected.task runTask.environment 'MOD_CLASSES', "${mod_id}%%${selected.directory.get().asFile}" runTask.doFirst { + if (runTask.name in ['runClient', 'runOptionalModsClient']) { + runTask.setArgs(['--launcher-side', 'client'] + runTask.args) + } + Set splitOutputs = sourceSets.collectMany { it.output.files }.collect { + it.canonicalFile.absolutePath + } as Set + runTask.classpath = files(selected.directory.get().asFile, runTask.classpath.files.findAll { + !splitOutputs.contains(it.canonicalFile.absolutePath) + }) + runTask.environment 'MOD_CLASSES', "${mod_id}%%${selected.directory.get().asFile}" File modsDirectory = new File(runTask.workingDir, 'mods') if (!modsDirectory.isDirectory() && !modsDirectory.mkdirs()) { throw new GradleException("Could not create development mods directory: ${modsDirectory}") @@ -364,3 +373,4 @@ apply from: 'gradle/release/publishing.gradle' apply from: 'gradle/verification/support.gradle' apply from: 'gradle/verification/packaged-runtime.gradle' apply from: 'gradle/ide/eclipse.gradle' +apply from: 'gradle/ide/intellij.gradle' diff --git a/ci-fixtures/tools/README.md b/ci-fixtures/tools/README.md index 0dea853bb..0fed77872 100644 --- a/ci-fixtures/tools/README.md +++ b/ci-fixtures/tools/README.md @@ -1,25 +1,47 @@ -# Forge 1.20.1 Mavenizer compatibility fixture - -`minecraft-mavenizer-0.5.21-orespawn-compat.jar` is a build-only derivative of -MinecraftForge MinecraftMavenizer `0.5.21`, source commit -`6968241ce7a0a902cdc1c534b976e8373a423091`. - -Forge 47's decompiler emits eight duplicate record accessors in Holder.Direct, -OptionInstance and MemoryCondition. The target-specific rules in -`minecraft-source-compatibility.json` remove only those accessors; Java -generates the same public methods automatically. Missing or ambiguous source -matches stop the build. The derivative also honors -`ORESPAWN_MAVENIZER_OFFLINE=true` by adding Mavenizer's native `--offline` -argument. This closes ForgeGradle 7's failure to propagate Gradle offline mode -to the subprocess; it does not alter normal online builds. - -`minecraft-mavenizer-0.5.21-orespawn-compat.patch` contains OreSpawn's source -changes. Apply it to the pinned upstream commit with `git am` to rebuild the -fixture using Temurin 25.0.3+9 and the upstream Gradle 9.1.0 wrapper. - -The fixture is used only while ForgeGradle prepares the development dependency. -It is checksum-verified by the build and excluded from every Base Metals artifact. -MinecraftMavenizer remains licensed LGPL-2.1-only; see `LICENSE-MAVENIZER.txt`. - -SHA-256: -`416DCA4797BC55826F0DDCF03FDC405F1990FC15C2133FA27A1F143BF7976177` +# ForgeGradle 7 Mavenizer compatibility fixture + +This directory contains a build-only derivative of MinecraftForge's +MinecraftMavenizer `0.5.21`. It is used only while ForgeGradle prepares the +exact Forge `1.20.6-50.2.0` development dependency and is excluded from every +Base Metals publication artifact. + +## Provenance and licence + +- Upstream: +- Exact source commit: `6968241ce7a0a902cdc1c534b976e8373a423091` +- Upstream version: `0.5.21` +- Licence: LGPL-2.1-only; see `LICENSE-MAVENIZER.txt` +- OreSpawn derivative patch: `minecraft-mavenizer-0.5.21-orespawn-compat.patch` +- Embedded/external rule manifest: `minecraft-source-compatibility.json` + +The patch adds a target-aware compatibility stage before Mavenizer recompiles +decompiled sources. Rules run only for an exact Maven artifact listed in the +manifest. Each rule requires one exact source file, one exact record +declaration and one accessor in that record. Missing, partial, duplicate or +ambiguous states fail preparation. Targets without an explicit rule set are +left unchanged. + +Forge `1.20.6-50.2.0` compiles without source compatibility edits. Its explicit +zero-rule entry proves that result is intentional and target-qualified rather +than an accidental fall-through. A marker beside Mavenizer's output records +the target and manifest SHA-256. Reprocessing the same source is idempotent. + +The derivative also propagates Gradle offline mode when the build sets +`ORESPAWN_MAVENIZER_OFFLINE=true`. Mavenizer itself runs on Java 25; Base Metals +and Minecraft 1.20.6 continue to compile for Java 21. + +## Rebuild + +1. Clone the upstream repository and detach at + `6968241ce7a0a902cdc1c534b976e8373a423091`. +2. Apply `minecraft-mavenizer-0.5.21-orespawn-compat.patch` with `git am`. +3. Set `JAVA_HOME` to Temurin Java 25. +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 + contains the authoritative checksums and also verifies the embedded + manifest, Java class version and licence/provenance files. + +The sealed derivative was built with Eclipse Temurin `25.0.3+9` and Gradle +`9.1.0` from the upstream wrapper. 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 2c068aaec..c37dc57b3 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 28951fba9..132011e06 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 @@ -1,4 +1,4 @@ -From 10279f8ab1adadb87b56f36c85dbda3cf64e62b3 Mon Sep 17 00:00:00 2001 +From 96468d9931e7f1448d9fb00f13ec0a6559ee0054 Mon Sep 17 00:00:00 2001 From: OreSpawn Build Fixture Date: Fri, 28 Aug 2026 15:21:10 +0100 Subject: [PATCH] Add target-aware source compatibility rules @@ -8,9 +8,9 @@ Subject: [PATCH] Add target-aware source compatibility rules .../net/minecraftforge/mcmaven/cli/Main.java | 18 +- .../minecraftforge/mcmaven/cli/MavenTask.java | 3 + .../mcmaven/impl/util/ProcessUtils.java | 2 + - .../impl/util/SourceCompatibilityPatcher.java | 241 ++++++++++++++++++ - .../minecraft-source-compatibility.json | 58 +++++ - 6 files changed, 322 insertions(+), 2 deletions(-) + .../impl/util/SourceCompatibilityPatcher.java | 247 ++++++++++++++++++ + .../minecraft-source-compatibility.json | 9 + + 6 files changed, 279 insertions(+), 2 deletions(-) create mode 100644 src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java create mode 100644 src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json @@ -111,10 +111,10 @@ index 9fa2888..d8c14fd 100644 var nonSourceFiles = new ArrayList(); diff --git a/src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java b/src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java new file mode 100644 -index 0000000..2cb07e0 +index 0000000..4d72d34 --- /dev/null +++ b/src/main/java/net/minecraftforge/mcmaven/impl/util/SourceCompatibilityPatcher.java -@@ -0,0 +1,241 @@ +@@ -0,0 +1,247 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only @@ -169,6 +169,12 @@ index 0000000..2cb07e0 + } + + validateTarget(target); ++ if (target.expectedApplications == 0) { ++ writeMarker(outputJar, artifact, manifestHash, target.rules); ++ LOGGER.info("OreSpawn Mavenizer compatibility: applied 0 rule(s) for " + artifact ++ + " (explicit no-op) manifest SHA-256 " + manifestHash); ++ return; ++ } + var sourceByFile = new LinkedHashMap(); + var present = 0; + var absent = 0; @@ -215,7 +221,7 @@ index 0000000..2cb07e0 + } + + private static void validateTarget(TargetRuleSet target) { -+ if (target.expectedApplications <= 0 || target.rules == null ++ if (target.expectedApplications < 0 || target.rules == null + || target.rules.size() != target.expectedApplications) { + throw new IllegalStateException("Compatibility target has an invalid expected application count"); + } @@ -358,65 +364,16 @@ index 0000000..2cb07e0 +} diff --git a/src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json b/src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json new file mode 100644 -index 0000000..462d571 +index 0000000..702d759 --- /dev/null +++ b/src/main/resources/META-INF/orespawn/minecraft-source-compatibility.json -@@ -0,0 +1,58 @@ +@@ -0,0 +1,9 @@ +{ + "schema": 1, + "targets": { -+ "net.minecraftforge:forge:1.19.4-45.4.0": { -+ "expectedApplications": 8, -+ "rules": [ -+ { -+ "id": "forge-1.19.4-holder-direct-value", -+ "file": "net/minecraft/core/Holder.java", -+ "recordDeclaration": "public static record Direct(T value) implements Holder", -+ "accessor": "\n public T value() {\n return this.value;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-alt-enum-value-setter", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", -+ "accessor": "\n public OptionInstance.CycleableValueSet.ValueSetter valueSetter() {\n return this.valueSetter;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-alt-enum-codec", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", -+ "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-enum-codec", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record Enum(List values, Codec codec)", -+ "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-option-lazy-enum-codec", -+ "file": "net/minecraft/client/OptionInstance.java", -+ "recordDeclaration": "public static record LazyEnum(Supplier> values, Function> validateValue, Codec codec)", -+ "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-memory-absent-memory", -+ "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", -+ "recordDeclaration": "public static record Absent(MemoryModuleType memory)", -+ "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-memory-present-memory", -+ "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", -+ "recordDeclaration": "public static record Present(MemoryModuleType memory)", -+ "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" -+ }, -+ { -+ "id": "forge-1.19.4-memory-registered-memory", -+ "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", -+ "recordDeclaration": "public static record Registered(MemoryModuleType memory)", -+ "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" -+ } -+ ] ++ "net.minecraftforge:forge:1.20.6-50.2.0": { ++ "expectedApplications": 0, ++ "rules": [] + } + } +} diff --git a/ci-fixtures/tools/minecraft-source-compatibility.json b/ci-fixtures/tools/minecraft-source-compatibility.json index 858f19762..702d7594a 100644 --- a/ci-fixtures/tools/minecraft-source-compatibility.json +++ b/ci-fixtures/tools/minecraft-source-compatibility.json @@ -1,58 +1,9 @@ { "schema": 1, "targets": { - "net.minecraftforge:forge:1.20.1-47.4.10": { - "expectedApplications": 8, - "rules": [ - { - "id": "forge-1.20.1-holder-direct-value", - "file": "net/minecraft/core/Holder.java", - "recordDeclaration": "public static record Direct(T value) implements Holder", - "accessor": "\n public T value() {\n return this.value;\n }\n" - }, - { - "id": "forge-1.20.1-option-alt-enum-value-setter", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", - "accessor": "\n public OptionInstance.CycleableValueSet.ValueSetter valueSetter() {\n return this.valueSetter;\n }\n" - }, - { - "id": "forge-1.20.1-option-alt-enum-codec", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record AltEnum(List values, List altValues, BooleanSupplier altCondition, OptionInstance.CycleableValueSet.ValueSetter valueSetter, Codec codec)", - "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" - }, - { - "id": "forge-1.20.1-option-enum-codec", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record Enum(List values, Codec codec)", - "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" - }, - { - "id": "forge-1.20.1-option-lazy-enum-codec", - "file": "net/minecraft/client/OptionInstance.java", - "recordDeclaration": "public static record LazyEnum(Supplier> values, Function> validateValue, Codec codec)", - "accessor": "\n public Codec codec() {\n return this.codec;\n }\n" - }, - { - "id": "forge-1.20.1-memory-absent-memory", - "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", - "recordDeclaration": "public static record Absent(MemoryModuleType memory)", - "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" - }, - { - "id": "forge-1.20.1-memory-present-memory", - "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", - "recordDeclaration": "public static record Present(MemoryModuleType memory)", - "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" - }, - { - "id": "forge-1.20.1-memory-registered-memory", - "file": "net/minecraft/world/entity/ai/behavior/declarative/MemoryCondition.java", - "recordDeclaration": "public static record Registered(MemoryModuleType memory)", - "accessor": "\n public MemoryModuleType memory() {\n return this.memory;\n }\n" - } - ] + "net.minecraftforge:forge:1.20.6-50.2.0": { + "expectedApplications": 0, + "rules": [] } } } diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index f21a8083d..6d78146d9 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -12,46 +12,30 @@ must remain the Base Metals item. Copper ore and storage tags contain both vanilla and Base Metals entries; Base Metals copper ore smelts to the Base Metals ingot. -These integrations use Minecraft 1.20.1 builds. Their APIs are compile-only -dependencies and never enter the normal development runtime. The separate -optional-mod profile uses the exact releases and checksums in -`gradle/optional-mods.json`; don't substitute jars for another Minecraft version. -Thermal and Ender IO use packaged-runtime tests rather than the IDE profile, -because their embedded dependencies retain production names after remapping. - -- Mekanism 10.4: dirty and clean slurries plus the complete ore-processing - sequence for Adamantine, Antimony, Bismuth, Cold Iron, Nickel, Platinum, - Starsteel, and Zinc. The slurry objects are registered only when Mekanism is - loaded and use its public API. -- Thermal Expansion 11: pulverizer, furnace, crucible, press, and induction - smelter recipes. -- Tinkers' Construct 3.11: common tags, melting, casting, alloying, and - data-defined material stats. No removed foreign traits are reimplemented. -- Ender IO 6.2 beta: SAG Mill and Alloy Smelter recipes. - -CoFH Core 11.0.2.56 logs a `MultiPlayerGameModeMixin` warning on dedicated -servers. This also occurs with CoFH Core alone and does not stop the server -loading. - -IC2, Thaumcraft, Dense Ores, VeinMiner, and Constructs Armory do not have direct -integrations in this version. Their generic tools and ore processors can still interoperate -through Forge tags. +The tags and existing integration data for Mekanism, Thermal, Tinkers' Construct +and Ender IO remain available for future compatibility work. None currently +has a published Forge 1.20.6 build, so their Java API hooks and runtime jars +are not included in this port. Do not substitute jars made for 1.20.1 or NeoForge. + +Other processors can use the shared Forge tags without a direct Java integration. Mineralogy is entirely optional. Base Metals never links to its Java classes; OreSpawn's rock-family host matching is the only integration point. ## Multiplayer login -Forge 47 can occasionally stop reading from a connection during login. Base -Metals keeps the protocol's read-pause and read-resume changes on Netty's event -loop to prevent that race. This does not skip any login checks or change the -connection timeout. +Base Metals checks the client's content mode during Forge's configuration phase. +Matching modes can join; different modes receive a message explaining which setting +needs to change. The check completes before the player enters the world. + +The Forge 47 connection patch used by the 1.20.1 release is not needed by this +target and is not included. ## Low Fantasy Base Metals filters its own crafting, processing, trades and chest additions. Its conditional integration recipes follow the same material restrictions. -Tinkers' bundled material stats do not provide bows or parts that would enable +The retained Tinkers data does not provide bows or parts that would enable a restricted tool family. Explicit third-party recipes and data-pack overrides remain under the pack author's control. diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index 52888c58f..58e5cf230 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -2,7 +2,7 @@ Always upgrade a copy and retain the original legacy world. Install Base Metals 3.1.0 and OreSpawn 4.1.0, but do not carry MMDLib, Additional Loot Tables, the -OreSpawn 3 plugin, or the old native fallback generator into the 1.20.1 instance. +OreSpawn 3 plugin, or the old native fallback generator into the 1.20.6 instance. Minecraft's data fixer cannot identify third-party numeric block IDs from before the 1.13 flattening. Base Metals snapshots those positions, runs @@ -86,6 +86,16 @@ 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 + +Minecraft 1.20.6 stores item properties as components rather than the older item +tag. Base Metals keeps names, enchantments, durability and custom data during +that conversion. Saved arrows and bolts also retain their ammunition. + +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. + ## OreSpawn 3 configuration OreSpawn 4.1 migrates OS3 files before merging provider defaults. When an diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index cc5f657a8..a83f07380 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -1,16 +1,16 @@ # Supported versions -Base Metals `3.1.0.120011` targets Minecraft 1.20.1, Forge 47.4.10 and Java 17. -OreSpawn `4.1.0.120011` is the exact build and test dependency. Clients and -servers need OreSpawn `[4.1.0.120011,5.0.0)`. +Base Metals `3.1.0.120061` targets Minecraft 1.20.6, Forge 50.2.0 and Java 21. +OreSpawn `4.1.0.120061` is the exact build and test dependency. Clients and +servers need OreSpawn `[4.1.0.120061,5.0.0)`. -The pinned CurseForge artifact is project 245586, file 9175609: -`curse.maven:mmd-orespawn-245586:9175609`. +The pinned CurseForge artifact is project 245586, file 9183384: +`curse.maven:mmd-orespawn-245586:9183384`. Its SHA-256 is -`E6BDE47C1BB0BF4D08396F1D1FD5B1D2D3F8A5DF09905F279D39E2601D7FE4B0`. +`FAA7107B9FB84E2C62ED847CAFD880AA3C4238A37799BAD955EA9602A944AA26`. Release artifacts use Maven coordinate -`zone.moddev.mc.basemetals:BaseMetals:3.1.0.120011`. +`zone.moddev.mc.basemetals:BaseMetals:3.1.0.120061`. The provider remains schema 3, revision 1. OreSpawn 4.1 is needed for the configuration-screen API; the provider's eleven rule IDs and 1.18 distributions diff --git a/docs/WORLDGEN.md b/docs/WORLDGEN.md index 88570e01c..aaf314dcf 100644 --- a/docs/WORLDGEN.md +++ b/docs/WORLDGEN.md @@ -1,8 +1,8 @@ # OreSpawn world generation -Base Metals requires OreSpawn `[4.1.0.120011,5.0.0)` and packages provider schema 3, +Base Metals requires OreSpawn `[4.1.0.120061,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.120011` release. The provider is checked against the +published OreSpawn `4.1.0.120061` 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 75bf7d2ca..795354994 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.120011. The Base Metals provider +These public schemas match OreSpawn 4.1.0.120061. 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.120011](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.120011). +Source: [OreSpawn 4.1.0.120061](https://github.com/MinecraftModDevelopmentMods/OreSpawn/releases/tag/4.1.0.120061). diff --git a/gradle.properties b/gradle.properties index 68bb25f73..302aa7bdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,32 +11,32 @@ net.minecraftforge.gradle.merge-source-sets=false ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.20.1 +minecraft_version=1.20.6 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.1,1.20.2) +minecraft_version_range=[1.20.6,1.21) # The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=47.4.10 -forge_installer_sha256=1912760B4CB6B803D8A826DE603C9076B1DA71EC2765E9A1F8C1CA78F65278E3 +forge_version=50.2.0 +forge_installer_sha256=8789098B077F5486449311A11DC05E977FEB9430913CB15F30B21A2D8AA213EA # Release metadata consumed by the generic dispatcher. loader_name=forge loader_code=1 -java_version=17 -java_toolchain_version=17.0.1+12 -gradle_java_version=17 +java_version=21 +java_toolchain_version=21.0.7+6 +gradle_java_version=21 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.120011 +orespawn_version=4.1.0.120061 orespawn_curse_project_id=245586 -orespawn_curse_file_id=9175609 -orespawn_sha256=E6BDE47C1BB0BF4D08396F1D1FD5B1D2D3F8A5DF09905F279D39E2601D7FE4B0 +orespawn_curse_file_id=9183384 +orespawn_sha256=FAA7107B9FB84E2C62ED847CAFD880AA3C4238A37799BAD955EA9602A944AA26 # The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[47,) +forge_version_range=[50,) # The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[47,) +loader_version_range=[50,) # 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=[47,) mapping_channel=official # The mapping version to query from the mapping channel. # This must match the format required by the mapping channel. -mapping_version=1.20.1 +mapping_version=1.20.6 ## Mod Properties @@ -67,7 +67,7 @@ mod_name=Base Metals # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=LGPL-2.1 # The mod version. See https://semver.org/ -mod_version=3.1.0.120011 +mod_version=3.1.0.120061 # 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 @@ -76,3 +76,8 @@ mod_group=zone.moddev.mc.basemetals mod_authors=Cyanobacterium, jriwanek, dshadowwolf, GetDizzy611, SkyBlade1978, the MMD Team # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. mod_description=Adds historically common metals, fantasy metals, alloys, tools, armour, and OreSpawn-powered deposits. + +# Forge 50 uses official runtime names. +reobf=false +mcp_version=20240429.135109 +java_setup_version=21.0.7+6.0.LTS diff --git a/gradle/README.md b/gradle/README.md index 1c562f1d1..9b7232a5d 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -12,6 +12,7 @@ the remaining build concerns small enough to review independently. packaged client and dedicated-server installations. - `ide/eclipse.gradle` normalizes ForgeGradle's Eclipse launches and checks that production runs cannot see validation-only code. +- `ide/intellij.gradle` generates Gradle-backed client and server configurations. Applied-script order is intentional. Artifact setup publishes an immutable `baseMetalsRelease` map consumed by publishing and packaged-runtime checks. @@ -27,19 +28,13 @@ The scythe's harvestable-block tag lives in `src/main/resources`. Its explicit block list preserves the older harvesting behaviour, while vanilla crop, flower, sapling and leaf tags include suitable new plants. -Normal client and server launches use an explicit runtime classpath, not -Buildship's full dependency container. Compile-only integration APIs therefore -remain available in the editor without loading extra mods into the game. +Normal client and server launches load only Base Metals and OreSpawn. The +optional-mod profile has its own run folder, but no optional integration mods +are pinned for Forge 1.20.6. Mekanism, Tinkers, Thermal and Ender IO have no +compatible releases for this target; their dormant data remains available for +future integration work. -`runClientOptionalMods` uses a separate folder and loads the pinned 1.20.1 -integration mods marked `development` in `gradle/optional-mods.json`. Their downloaded jars -are checked by `verifyOptionalRuntimeDependencies`. Ordinary client and server -launches still load only essential mods. - -Use `compatSmoke` for development-runtime integration tests or -`packagedCompatSmoke` for the packaged server tests. Neither switch is needed -for ordinary development. - -Thermal and Ender IO are covered by packaged client/server tests. Their embedded -dependencies still use SRG names after development remapping, so they are not -included in the IDE profile. +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 +side of ForgeGradle's launcher so it resolves assets and native libraries. diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index a48d5ee3d..ad567e737 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -7,16 +7,7 @@ configurations.create('packagedCompatibilityMods') configurations.create('optionalModsRelease') ext.optionalModArtifacts = new JsonSlurper().parse(file('gradle/optional-mods.json')) ext.optionalDevelopmentArtifacts = optionalModArtifacts.findAll { it.development } -def optionalDevelopmentDependencies = optionalDevelopmentArtifacts.collectEntries { artifact -> - def dependency = renamer.dependency("curse.maven:${artifact.module}:${artifact.file}") { - // CoFH uses the valid *() wildcard, which Renamer cannot parse. - // Keep its AT file intact; Forge remaps SRG access rules when loading it. - if (artifact.modId == 'cofh_core') { - accessTransformers.set(false) - } - } - [(artifact.modId): dependency] -} +def optionalDevelopmentDependencies = [:] repositories { minecraft.mavenizer(it) maven fg.forgeMaven @@ -63,54 +54,18 @@ dependencies { implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}") // OreSpawn remains an ordinary hard mod dependency in metadata and is - // never shaded into Base Metals. Use the published 1.20.1 release in + // never shaded into Base Metals. Use the published 1.20.6 release in // development so clean checkouts exercise the same artifact as players. - implementation renamer.dependency("curse.maven:mmd-orespawn-${orespawn_curse_project_id}:${orespawn_curse_file_id}") + 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}" - // API only: Mekanism remains optional at runtime. Its public slurry - // registry is required to provide the eight historical processing chains. - compileOnly 'mekanism:Mekanism:1.20.1-10.4.16.80:api' - compileOnly optionalDevelopmentDependencies.mantle - compileOnly optionalDevelopmentDependencies.tconstruct - - // Only the separate optional-mod profile and explicit compatibility tests load these mods. - optionalModArtifacts.each { artifact -> - String coordinate = "curse.maven:${artifact.module}:${artifact.file}" - optionalModsRelease coordinate - if (artifact.development) { - optionalModsRuntimeOnly optionalDevelopmentDependencies[artifact.modId] - if (providers.gradleProperty('compatSmoke').isPresent()) { - runtimeOnly optionalDevelopmentDependencies[artifact.modId] - } - } - if (providers.gradleProperty('packagedCompatSmoke').isPresent()) { - packagedCompatibilityMods coordinate - } - } - + // No optional integrations currently publish Forge 1.20.6 builds. 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' } -renamer.mappings.from minecraft.dependency.toSrgFile - -// Optional mods ship SRG mixin references; development runs use official names. -def developmentMixinMappings = renamer.convert('optionalMixinMappings') { - // Mixin 0.8 reads classic SRG entries, not TSRG, from this file. - map.from minecraft.dependency.toSrgFile - format.set('srg') - reverse.set(true) - output.set(layout.buildDirectory.file('mappings/optional-refmaps.srg')) -} -minecraft.runs.configureEach { - systemProperties(developmentMixinMappings.flatMap { it.output }.map { mappings -> - ['mixin.env.remapRefMap': 'true', 'mixin.env.refMapRemappingFile': mappings.asFile.absolutePath] - }) -} - configurations.named('testRuntimeClasspath') { exclude group: 'curse.maven', module: orespawnModule } diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle index a65641253..1b0e1af20 100644 --- a/gradle/ide/eclipse.gradle +++ b/gradle/ide/eclipse.gradle @@ -5,7 +5,7 @@ import groovy.xml.XmlUtil def eclipseWorkspaceProjectName = projectDir.name // ForgeGradle 7 Eclipse launches are normalized after generation: they use the -// configured Gradle cache and Java 17, load only bin/main, and exclude all unit, +// configured Gradle cache and Java 21, load only bin/main, and exclude all unit, // GameTest, integrated-smoke, and upgrade-smoke code from production launches. eclipse { classpath { @@ -73,15 +73,15 @@ def verifyDevelopmentRunProfiles = tasks.register('verifyDevelopmentRunProfiles' || optionalDevelopmentArtifacts.any { expected -> !optionalClient.classpath.files.any { it.name.contains("${expected.module}-${expected.file}") } }) { - throw new GradleException('The optional client must load the pinned 1.20.1 dependencies') + throw new GradleException('The optional client must load the pinned 1.20.6 dependencies') } } } -def syncForge47EclipseLaunches = tasks.register('syncForge47EclipseLaunches') { +def syncForge50EclipseLaunches = tasks.register('syncForge50EclipseLaunches') { group = 'ide' - description = 'Normalizes Forge 47 Eclipse launches to the production-only merged output.' - dependsOn tasks.named('processResources') + description = 'Normalizes Forge 50 Eclipse launches to the production-only merged output.' + dependsOn tasks.named('classes') doLast { String mainOutput = new File(projectDir, 'bin/main').absolutePath String modClasses = "${mod_id}%%${mainOutput}" @@ -113,6 +113,7 @@ def syncForge47EclipseLaunches = tasks.register('syncForge47EclipseLaunches') { File processedResources = layout.buildDirectory.dir('resources/main').get().asFile copy { from processedResources + from sourceSets.main.output.classesDirs into mainOutput } ['Client', 'Server', 'OptionalModsClient'].each { String runName -> @@ -138,13 +139,16 @@ def syncForge47EclipseLaunches = tasks.register('syncForge47EclipseLaunches') { throw new GradleException("ForgeGradle generated malformed program arguments in ${launch.name}") } String arguments = programArguments[0][2] + if (runName != 'Server' && !arguments.contains('--launcher-side client')) { + arguments = '--launcher-side client ' + arguments + } ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> String prefix = "--${flag} " int valueStart = arguments.indexOf(prefix) - if (valueStart < 0) throw new GradleException("ForgeGradle omitted --${flag} from ${launch.name}") + if (valueStart < 0) return valueStart += prefix.length() int valueEnd = arguments.indexOf(' --', valueStart) - if (valueEnd < 0) throw new GradleException("ForgeGradle generated an unterminated --${flag} path") + if (valueEnd < 0) valueEnd = arguments.length() String value = arguments.substring(valueStart, valueEnd) if (!value.startsWith('"') || !value.endsWith('"')) { arguments = "${arguments.substring(0, valueStart)}"${value}"${arguments.substring(valueEnd)}" @@ -156,14 +160,12 @@ def syncForge47EclipseLaunches = tasks.register('syncForge47EclipseLaunches') { String legacyPrefix = '-DlegacyClassPath.file=' int legacyStart = text.indexOf(legacyPrefix) int legacyEnd = text.indexOf(' -DignoreList=', legacyStart) - if (legacyStart < 0 || legacyEnd < 0) { - throw new GradleException("ForgeGradle omitted -DlegacyClassPath.file from ${launch.name}") - } + String xmlQuote = '"' boolean quoted = legacyStart >= xmlQuote.length() && text.substring(legacyStart - xmlQuote.length(), legacyStart) == xmlQuote && text.substring(legacyEnd - xmlQuote.length(), legacyEnd) == xmlQuote - if (!quoted) { + if (legacyStart >= 0 && legacyEnd >= 0 && !quoted) { text = text.substring(0, legacyStart) + xmlQuote + text.substring(legacyStart, legacyEnd) + xmlQuote + text.substring(legacyEnd) } @@ -174,6 +176,13 @@ def syncForge47EclipseLaunches = tasks.register('syncForge47EclipseLaunches') { } // Buildship also exposes compile-only APIs. Use the selected runtime instead. def launchXml = new XmlParser(false, false).parseText(text) + def environment = launchXml.mapAttribute.find { + it.@key == 'org.eclipse.debug.core.environmentVariables' + } + def modClassesEntry = environment.mapEntry.find { it.@key == 'MOD_CLASSES' } + if (modClassesEntry == null) environment.appendNode('mapEntry', [key: 'MOD_CLASSES', value: modClasses]) + else modClassesEntry.@value = modClasses + def vmArguments = launchXml.stringAttribute.find { it.@key == 'org.eclipse.jdt.launching.VM_ARGUMENTS' } @@ -212,7 +221,7 @@ def syncForge47EclipseLaunches = tasks.register('syncForge47EclipseLaunches') { def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionClasspath') { group = 'verification' description = 'Verifies Eclipse client/server launches cannot see validation-only code.' - dependsOn syncForge47EclipseLaunches + dependsOn syncForge50EclipseLaunches dependsOn verifyDevelopmentRunProfiles doLast { File classpath = file('.classpath') @@ -288,21 +297,14 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } String expectedModClasses = "${mod_id}%%${new File(projectDir, 'bin/main').absolutePath}" if (!launch.contains(expectedModClasses)) { - throw new GradleException("Eclipse launch is not using Forge 47's merged production output: ${name}") + throw new GradleException("Eclipse launch is not using Forge 50's merged production output: ${name}") } ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> - if (!launch.contains("--${flag} "")) { + if (launch.contains("--${flag} ") && !launch.contains("--${flag} "")) { throw new GradleException("Eclipse launch does not quote its --${flag} path: ${name}") } } - if (!launch.contains('"-DlegacyClassPath.file=') - || !launch.contains('minecraft_classpath.txt" -DignoreList=')) { - throw new GradleException("Eclipse launch does not quote -DlegacyClassPath.file: ${name}") - } - if (!launch.contains('"-Dmixin.env.refMapRemappingFile=') - || !launch.contains('optional-refmaps.srg"')) { - throw new GradleException("Eclipse launch does not quote its mixin mapping path: ${name}") - } + } File processed = layout.buildDirectory.dir('resources/main').get().asFile ['META-INF/mods.toml', 'data/basemetals/orespawn/provider.json', @@ -315,26 +317,32 @@ def verifyEclipseProductionClasspath = tasks.register('verifyEclipseProductionCl } } String metadata = new File(projectDir, 'bin/main/META-INF/mods.toml').getText('UTF-8') - if (metadata.contains('${') || !metadata.contains('version="3.1.0.120011"')) { + if (metadata.contains('${') || !metadata.contains('version="3.1.0.120061"')) { throw new GradleException('Eclipse output contains unresolved or invalid Base Metals version metadata') } } } verifyDevelopmentRunProfiles.configure { - dependsOn syncForge47EclipseLaunches + dependsOn syncForge50EclipseLaunches } tasks.matching { it.name == 'genEclipseRuns' }.configureEach { - finalizedBy syncForge47EclipseLaunches + finalizedBy syncForge50EclipseLaunches } tasks.register('isolateEclipseProductionRuns') { group = 'ide' dependsOn tasks.named('genEclipseRuns') - dependsOn syncForge47EclipseLaunches + dependsOn syncForge50EclipseLaunches } tasks.matching { it.name == 'eclipse' }.configureEach { - finalizedBy syncForge47EclipseLaunches + finalizedBy syncForge50EclipseLaunches +} + +// Use this after import or refresh to regenerate and check the ordinary launches. +tasks.register('prepareEclipse') { + group = 'ide' + dependsOn 'eclipse', 'genEclipseRuns', 'verifyEclipseProductionClasspath' } diff --git a/gradle/ide/intellij.gradle b/gradle/ide/intellij.gradle new file mode 100644 index 000000000..2cb264a10 --- /dev/null +++ b/gradle/ide/intellij.gradle @@ -0,0 +1,43 @@ +import groovy.xml.XmlSlurper + +// Gradle owns the Forge bootstrap, assets and production classpath in these runs. +def generateIntelliJRuns = tasks.register('genIntellijRuns') { + group = 'ide' + description = 'Creates IntelliJ Gradle run configurations for the ordinary client and server.' + doLast { + File directory = file('.run') + directory.mkdirs() + ['Client': 'runClient', 'Server': 'runServer'].each { label, task -> + new File(directory, "Base Metals ${label}.run.xml").setText('''\ + + + + + + + + +'''.replace('LABEL', label).replace('TASK', task), 'UTF-8') + } + } +} + +tasks.register('prepareIntelliJ') { + group = 'ide' + description = 'Creates and checks production-only IntelliJ launches.' + dependsOn generateIntelliJRuns + doLast { + ['Client': 'runClient', 'Server': 'runServer'].each { label, task -> + def run = new XmlSlurper().parse(file(".run/Base Metals ${label}.run.xml")) + def settings = run.configuration.ExternalSystemSettings + String projectPath = settings.option.find { it.@name == 'externalProjectPath' }.@value.text() + String taskName = settings.option.find { it.@name == 'taskNames' }.list.option.@value.text() + if (projectPath != '$PROJECT_DIR$' || taskName != task) { + throw new GradleException("IntelliJ ${label} must use the ordinary Gradle launch") + } + } + } +} diff --git a/gradle/optional-mods.json b/gradle/optional-mods.json index 38f007c19..fe51488c7 100644 --- a/gradle/optional-mods.json +++ b/gradle/optional-mods.json @@ -1,58 +1 @@ -[ - { - "modId": "mekanism", - "development": true, - "module": "mekanism-268560", - "file": "6552911", - "version": "10.4.16.80", - "sha256": "3B0D191FA4A45E662F9725991D76A30192F30186ABB2BA694B873B5F7B9358D2" - }, - { - "modId": "mantle", - "development": true, - "module": "mantle-74924", - "file": "7563777", - "version": "1.11.104", - "sha256": "6052E47C3981064BD5213728EAA3C5418289F6F85B07A1CD4DD1505239248838" - }, - { - "modId": "tconstruct", - "development": true, - "module": "tinkers-construct-74072", - "file": "7449219", - "version": "3.11.2.166", - "sha256": "653B49D73481A1325BA78ADC7273DEE6C765A51BAFDF264A7510576D6EF91C43" - }, - { - "modId": "cofh_core", - "development": true, - "module": "cofh-core-69162", - "file": "5374122", - "version": "11.0.2.56", - "sha256": "D7CD3EC8083E294E17CB50FE607B416C1DC83CE885E53BA3995D86E028F790E0" - }, - { - "modId": "thermal_foundation", - "development": false, - "module": "thermal-foundation-222880", - "file": "5443583", - "version": "11.0.6.70", - "sha256": "8CB610ABB3C835B47F9B4EC19BE6A54104D1F61230B67A9D5BFD097C5AC45823" - }, - { - "modId": "thermal_expansion", - "development": false, - "module": "thermal-expansion-69163", - "file": "5372749", - "version": "11.0.1.29", - "sha256": "F44D9E2476DEB0CE2700C3837AA6E99C6A6BC95BC2D89D69EBE34B6C3A612633" - }, - { - "modId": "enderio", - "development": false, - "module": "ender-io-64578", - "file": "7726916", - "version": "6.2.18-beta", - "sha256": "9D1471E6D4562D0A50F0564BC46573B87FD738BD440FE19397D31847DA20F172" - } -] +[] diff --git a/gradle/prepare-forge-client-runtime.py b/gradle/prepare-forge-client-runtime.py index 2ee3ffeec..d5cf77dca 100644 --- a/gradle/prepare-forge-client-runtime.py +++ b/gradle/prepare-forge-client-runtime.py @@ -18,12 +18,19 @@ from pathlib import Path from typing import Any -MINECRAFT_VERSION = "1.20.1" -FORGE_VERSION = "47.4.10" -FORGE_INSTALLER_SHA256 = "1912760b4cb6b803d8a826de603c9076b1da71ec2765e9a1f8c1ca78f65278e3" +PROJECT_PROPERTIES = dict( + line.split("=", 1) + for line in (Path(__file__).resolve().parents[1] / "gradle.properties") + .read_text(encoding="utf-8").splitlines() + if line and not line.startswith("#") and "=" in line +) + +MINECRAFT_VERSION = PROJECT_PROPERTIES["minecraft_version"] +FORGE_VERSION = PROJECT_PROPERTIES["forge_version"] +FORGE_INSTALLER_SHA256 = PROJECT_PROPERTIES["forge_installer_sha256"].lower() VERSION_MANIFEST_URL = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" ASSET_OBJECT_URL = "https://resources.download.minecraft.net/{prefix}/{digest}" -USER_AGENT = "BaseMetals-release-validation/3.1.0.120011" +USER_AGENT = f"BaseMetals-release-validation/{PROJECT_PROPERTIES['mod_version']}" def digest_file(path: Path, algorithm: str) -> str: diff --git a/gradle/release/artifacts.gradle b/gradle/release/artifacts.gradle index 6cf36ba1e..8af325a0a 100644 --- a/gradle/release/artifacts.gradle +++ b/gradle/release/artifacts.gradle @@ -48,8 +48,8 @@ def expectedMavenArtifact = 'BaseMetals' def expectedMavenCoordinate = "${expectedMavenGroup}:${expectedMavenArtifact}:${project.version}" tasks.named('jar', Jar) { - archiveClassifier = 'deobf' - destinationDirectory = layout.buildDirectory.dir('libs-dev') + archiveClassifier = null + destinationDirectory = layout.buildDirectory.dir('libs') manifest { attributes([ 'Maven-Artifact' : expectedMavenCoordinate, @@ -59,19 +59,14 @@ tasks.named('jar', Jar) { 'Implementation-Title' : 'Base Metals', 'Implementation-Version': project.version, 'Implementation-Vendor' : project.mod_authors, - 'Built-On-Java' : '17', + 'Built-On-Java' : '21', 'Built-On' : "${project.minecraft_version}-${project.forge_version}", 'Build-Target' : "minecraft-${project.minecraft_version}-${project.loader_name}-${project.forge_version}-java-${project.java_version}" ]) } } -def releaseJar = renamer.classes(tasks.named('jar', Jar)) { - map.from minecraft.dependency.toSrgFile - archiveClassifier = null - output = layout.buildDirectory.file( - "libs/${base.archivesName.get()}-${project.version}.jar") -} +def releaseJar = tasks.named('jar', Jar) ['apiElements', 'runtimeElements'].each { configurationName -> configurations.named(configurationName) { artifacts.clear() } @@ -92,30 +87,24 @@ def expectedReleaseNames = [mainReleaseName, sourcesReleaseName, javadocReleaseN def packagedServerSmokeJar = tasks.register('packagedServerSmokeJar', Jar) { dependsOn tasks.named(sourceSets.packagedServerSmoke.classesTaskName) dependsOn tasks.named(sourceSets.upgradeSmoke.classesTaskName) - archiveFileName = 'basemetals-server-smoke-dev.jar' + archiveFileName = 'basemetals-server-smoke.jar' destinationDirectory = layout.buildDirectory.dir('packaged-smoke-probes') from sourceSets.packagedServerSmoke.output.classesDirs from sourceSets.upgradeSmoke.output.classesDirs from 'src/packagedServerSmoke/packaged-resources' } -def packagedServerSmokeProbe = renamer.classes(packagedServerSmokeJar) { - map.from minecraft.dependency.toSrgFile - output = layout.buildDirectory.file('packaged-smoke-probes/basemetals-server-smoke.jar') -} +def packagedServerSmokeProbe = packagedServerSmokeJar def packagedClientSmokeJar = tasks.register('packagedClientSmokeJar', Jar) { dependsOn tasks.named(sourceSets.integratedSmoke.classesTaskName) dependsOn tasks.named(sourceSets.packagedClientSmoke.classesTaskName) - archiveFileName = 'basemetals-client-smoke-dev.jar' + archiveFileName = 'basemetals-client-smoke.jar' destinationDirectory = layout.buildDirectory.dir('packaged-smoke-probes') from sourceSets.integratedSmoke.output.classesDirs from sourceSets.packagedClientSmoke.output.classesDirs from 'src/packagedClientSmoke/packaged-resources' } -def packagedClientSmokeProbe = renamer.classes(packagedClientSmokeJar) { - map.from minecraft.dependency.toSrgFile - output = layout.buildDirectory.file('packaged-smoke-probes/basemetals-client-smoke.jar') -} +def packagedClientSmokeProbe = packagedClientSmokeJar def preparedReleaseDir = project.findProperty('preparedReleaseDir') project.ext.baseMetalsRelease = [ @@ -160,15 +149,15 @@ def configuredOreSpawnIdentity = [ sha256: project.orespawn_sha256.toString() ] -tasks.register('verifyJava17Toolchain') { +tasks.register('verifyJava21Toolchain') { group = 'verification' description = 'Verifies the exact Java product toolchain used for Base Metals compilation.' dependsOn tasks.named('compileJava') doLast { def metadata = tasks.named('compileJava', JavaCompile).get().javaCompiler.get().metadata - if (configuredJavaToolchainVersion != '17.0.1+12' - || metadata.languageVersion.asInt() != 17 - || metadata.jvmVersion != configuredJavaToolchainVersion + if (configuredJavaToolchainVersion != '21.0.7+6' + || metadata.languageVersion.asInt() != 21 + || !(metadata.jvmVersion in [configuredJavaToolchainVersion, configuredJavaToolchainVersion + '-LTS']) || !metadata.vendor.toString().toLowerCase(Locale.ROOT).contains('temurin')) { throw new GradleException("Expected Eclipse Temurin ${configuredJavaToolchainVersion}, found " + "${metadata.vendor} ${metadata.jvmVersion} at ${metadata.installationPath}") @@ -194,7 +183,7 @@ tasks.register('verifyMavenCoordinates') { tasks.register('verifyMavenizerCompatibilityFixture') { group = 'verification' - description = 'Verifies the checksum-sealed Forge 1.20.1 Mavenizer compatibility fixture.' + description = 'Verifies the checksum-sealed Forge 1.20.6 Mavenizer compatibility fixture.' inputs.file project.ext.mavenizerCompatibilityJar doLast { File fixture = project.ext.mavenizerCompatibilityJar.asFile @@ -208,23 +197,23 @@ tasks.register('verifyMavenizerCompatibilityFixture') { tasks.register('verifyReleaseConfiguration') { group = 'verification' - description = 'Verifies the exact Base Metals 1.20.1 release identity.' + description = 'Verifies the exact Base Metals 1.20.6 release identity.' dependsOn tasks.named('verifyMavenizerCompatibilityFixture') - dependsOn tasks.named('verifyJava17Toolchain') + dependsOn tasks.named('verifyJava21Toolchain') doLast { - if (configuredReleaseIdentity.modVersion != '3.1.0.120011' + if (configuredReleaseIdentity.modVersion != '3.1.0.120061' || configuredReleaseIdentity.modGroup != expectedMavenGroup - || configuredReleaseIdentity.minecraftVersion != '1.20.1' - || configuredReleaseIdentity.forgeVersion != '47.4.10' - || configuredReleaseIdentity.forgeInstallerSha256 != '1912760B4CB6B803D8A826DE603C9076B1DA71EC2765E9A1F8C1CA78F65278E3' + || configuredReleaseIdentity.minecraftVersion != '1.20.6' + || configuredReleaseIdentity.forgeVersion != '50.2.0' + || configuredReleaseIdentity.forgeInstallerSha256 != '8789098B077F5486449311A11DC05E977FEB9430913CB15F30B21A2D8AA213EA' || configuredReleaseIdentity.mappingChannel != 'official' - || configuredReleaseIdentity.mappingVersion != '1.20.1' + || configuredReleaseIdentity.mappingVersion != '1.20.6' || configuredReleaseIdentity.loaderName != 'forge' || configuredReleaseIdentity.loaderCode != '1' - || configuredReleaseIdentity.javaVersion != '17' - || configuredReleaseIdentity.gradleJavaVersion != '17' + || configuredReleaseIdentity.javaVersion != '21' + || configuredReleaseIdentity.gradleJavaVersion != '21' || configuredReleaseIdentity.curseForgeProjectId != '240967') { - throw new GradleException('Unexpected Base Metals 1.20.1 release identity') + throw new GradleException('Unexpected Base Metals 1.20.6 release identity') } } } @@ -233,10 +222,10 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn qualification dependency.' doLast { - if (configuredOreSpawnIdentity.version != '4.1.0.120011' + if (configuredOreSpawnIdentity.version != '4.1.0.120061' || configuredOreSpawnIdentity.curseProjectId != '245586' - || configuredOreSpawnIdentity.curseFileId != '9175609' - || configuredOreSpawnIdentity.sha256 != 'E6BDE47C1BB0BF4D08396F1D1FD5B1D2D3F8A5DF09905F279D39E2601D7FE4B0') { + || configuredOreSpawnIdentity.curseFileId != '9183384' + || configuredOreSpawnIdentity.sha256 != 'FAA7107B9FB84E2C62ED847CAFD880AA3C4238A37799BAD955EA9602A944AA26') { throw new GradleException('Unexpected OreSpawn release coordinates') } File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts @@ -304,7 +293,7 @@ tasks.register('verifyReleaseArtifacts') { new DataInputStream(zip.getInputStream(entry)).withCloseable { input -> if (input.readInt() != (int) 0xCAFEBABE) throw new GradleException("Invalid class: ${entry.name}") input.readUnsignedShort() - if (input.readUnsignedShort() != 61) throw new GradleException("Class is not Java 17: ${entry.name}") + if (input.readUnsignedShort() != 65) throw new GradleException("Class is not Java 21: ${entry.name}") } } def names = zip.entries().toList().collect { it.name } as Set @@ -325,14 +314,14 @@ tasks.register('verifyReleaseArtifacts') { if (manifest.mainAttributes.getValue('Maven-Artifact') != expectedMavenCoordinate) { throw new GradleException('Release manifest contains the wrong Maven coordinate') } - String expectedBuildTarget = 'minecraft-1.20.1-forge-47.4.10-java-17' + String expectedBuildTarget = 'minecraft-1.20.6-forge-50.2.0-java-21' if (manifest.mainAttributes.getValue('Build-Target') != expectedBuildTarget) { throw new GradleException('Release manifest contains the wrong stable build target') } String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') if (modsToml.contains('${') - || !modsToml.contains('version="3.1.0.120011"') - || !modsToml.contains('versionRange="[4.1.0.120011,5.0.0)"')) { + || !modsToml.contains('version="3.1.0.120061"') + || !modsToml.contains('versionRange="[4.1.0.120061,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 cfa893b3a..95288af53 100644 --- a/gradle/verification/packaged-runtime.gradle +++ b/gradle/verification/packaged-runtime.gradle @@ -6,8 +6,8 @@ def releaseJar = release.releaseJar def packagedServerSmokeProbe = release.packagedServerSmokeProbe def packagedClientSmokeProbe = release.packagedClientSmokeProbe -def java17Launcher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(17) +def java21Launcher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) vendor = JvmVendorSpec.ADOPTIUM } @@ -19,7 +19,7 @@ def packagedClientRunDirectory = layout.buildDirectory.dir('packaged-client-run' def requireRuntimeDirectory = { Provider configuredPath, String propertyName -> if (!configuredPath.isPresent()) { - throw new GradleException("Pass -P${propertyName}=") + throw new GradleException("Pass -P${propertyName}=") } File runtime = file(configuredPath.get()) if (!runtime.isDirectory()) throw new GradleException("${propertyName} does not name a directory: ${runtime}") @@ -84,8 +84,8 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex doFirst { File runtime = requireRuntimeDirectory(packagedForgeServerRuntime, 'packagedForgeServerRuntime') File libraries = new File(runtime, 'libraries') - File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.20.1-47.4.10') - File launcher = new File(forgeDirectory, 'forge-1.20.1-47.4.10-server.jar') + File forgeDirectory = new File(libraries, 'net/minecraftforge/forge/1.20.6-50.2.0') + File launcher = new File(forgeDirectory, 'forge-1.20.6-50.2.0-server.jar') File sourceArguments = new File(forgeDirectory, System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows') ? 'win_args.txt' : 'unix_args.txt') @@ -99,8 +99,23 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex .replace('libraries/', libraryPath) .replace('-DlibraryDirectory=libraries', "-DlibraryDirectory=${libraries.canonicalPath}"), 'UTF-8') + copy { + from new File(runtime, "forge-${minecraft_version}-${forge_version}-shim.jar") + into runDirectory + } + libraries.eachFileRecurse(groovy.io.FileType.FILES) { File source -> + File target = new File(runDirectory, 'libraries').toPath() + .resolve(libraries.toPath().relativize(source.toPath())).toFile() + target.parentFile.mkdirs() + if (!target.exists()) { + try { java.nio.file.Files.createLink(target.toPath(), source.toPath()) } + catch (IOException | UnsupportedOperationException | SecurityException ignored) { + java.nio.file.Files.copy(source.toPath(), target.toPath()) + } + } + } workingDir runDirectory - commandLine java17Launcher.get().executablePath.asFile.absolutePath, + commandLine java21Launcher.get().executablePath.asFile.absolutePath, '-Xms512m', '-Xmx2g', "@${absoluteArguments.absolutePath}", 'nogui' } doLast { @@ -109,9 +124,9 @@ def packagedServerStartupSmoke = tasks.register('packagedServerStartupSmoke', Ex if (!marker.isFile()) throw new GradleException('Packaged dedicated-server completion marker is missing') Properties values = new Properties() marker.withInputStream { values.load(it) } - if (values.getProperty('basemetals') != '3.1.0.120011' - || values.getProperty('orespawn') != '4.1.0.120011' - || values.getProperty('forge') != '47.4.10') { + if (values.getProperty('basemetals') != '3.1.0.120061' + || values.getProperty('orespawn') != '4.1.0.120061' + || values.getProperty('forge') != '50.2.0') { throw new GradleException("Packaged dedicated-server versions are wrong: ${values}") } verifyPackagedLog(runDirectory, 'BASEMETALS_PACKAGED_SERVER_SMOKE PASS', @@ -153,11 +168,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.20.1/1.20.1.jar')).withCloseable { zip -> + new java.util.zip.ZipFile(new File(runtime, 'versions/1.20.6/1.20.6.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":15,"description":"Ore host replacement test"}}\n', 'UTF-8') + '{"pack":{"pack_format":32,"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') } @@ -177,13 +192,13 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex dependsOn preparePackagedClientSmoke doFirst { File runtime = requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime') - String forgeVersionId = ['1.20.1-forge-47.4.10', 'forge-47.4.10'].find { candidate -> + String forgeVersionId = ['1.20.6-forge-50.2.0', 'forge-50.2.0'].find { candidate -> new File(runtime, "versions/${candidate}/${candidate}.json").isFile() } - if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 47.4.10 profile') + if (forgeVersionId == null) throw new GradleException('Official client runtime has no Forge 50.2.0 profile') File forgeJsonFile = new File(runtime, "versions/${forgeVersionId}/${forgeVersionId}.json") - File baseJsonFile = new File(runtime, 'versions/1.20.1/1.20.1.json') - File baseJar = new File(runtime, 'versions/1.20.1/1.20.1.jar') + File baseJsonFile = new File(runtime, 'versions/1.20.6/1.20.6.json') + File baseJar = new File(runtime, 'versions/1.20.6/1.20.6.jar') File nativesDirectory = new File(runtime, "natives/${forgeVersionId}") [forgeJsonFile, baseJsonFile, baseJar, new File(runtime, 'libraries'), new File(runtime, 'assets'), nativesDirectory].each { @@ -232,7 +247,7 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex List gameArguments = [] gameArguments.addAll((List) ((Map) forgeJson.arguments).game) gameArguments.addAll([ - '--username', 'BaseMetalsValidation', + '--username', 'BMValidation', '--version', (String) forgeJson.id, '--gameDir', packagedClientRunDirectory.get().asFile.absolutePath, '--assetsDir', new File(runtime, 'assets').absolutePath, @@ -246,7 +261,7 @@ def packagedClientStartupSmoke = tasks.register('packagedClientStartupSmoke', Ex File runDirectory = packagedClientRunDirectory.get().asFile workingDir runDirectory File clientJava = packagedClientJavaExecutable.isPresent() - ? file(packagedClientJavaExecutable.get()) : java17Launcher.get().executablePath.asFile + ? file(packagedClientJavaExecutable.get()) : java21Launcher.get().executablePath.asFile if (!clientJava.isFile()) { throw new GradleException("packagedClientJavaExecutable does not name a Java executable: ${clientJava}") } diff --git a/gradle/verification/support.gradle b/gradle/verification/support.gradle index fa621b7d8..85b8331da 100644 --- a/gradle/verification/support.gradle +++ b/gradle/verification/support.gradle @@ -112,17 +112,62 @@ tasks.named('check').configure { dependsOn tasks.named('verifyReleaseConfiguration') } -def prepareGameTestStructures = tasks.register('prepareGameTestStructures', Copy) { +def gameTestResources = layout.buildDirectory.dir('gametest-resources') + +def prepareGameTestStructures = tasks.register('prepareGameTestStructures') { group = 'verification' - description = 'Copies the tracked SNBT fixtures into the GameTest working directory.' - from layout.projectDirectory.dir('src/gametest/resources/gameteststructures') - into layout.projectDirectory.dir('run-gametest/gameteststructures') + description = 'Creates the empty structure used by the isolated GameTests.' + outputs.dir gameTestResources + doLast { + File structure = new File(gameTestResources.get().asFile, 'data/basemetals/structures/empty.nbt') + structure.parentFile.mkdirs() + structure.withOutputStream { fileStream -> + new DataOutputStream(new java.util.zip.GZIPOutputStream(fileStream)).withCloseable { nbt -> + nbt.writeByte(10); nbt.writeUTF('') + nbt.writeByte(3); nbt.writeUTF('DataVersion'); nbt.writeInt(3839) + nbt.writeByte(9); nbt.writeUTF('size'); nbt.writeByte(3); nbt.writeInt(3) + [3, 3, 3].each { nbt.writeInt(it) } + nbt.writeByte(9); nbt.writeUTF('palette'); nbt.writeByte(10); nbt.writeInt(1) + nbt.writeByte(8); nbt.writeUTF('Name'); nbt.writeUTF('minecraft:air'); nbt.writeByte(0) + ['blocks', 'entities'].each { name -> + nbt.writeByte(9); nbt.writeUTF(name); nbt.writeByte(10); nbt.writeInt(0) + } + nbt.writeByte(0) + } + } + } } +sourceSets.gameTestValidation.resources.srcDir gameTestResources +tasks.named('processGameTestValidationResources').configure { dependsOn prepareGameTestStructures } + tasks.matching { it.name == 'prepareRunGameTestServer' }.configureEach { dependsOn prepareGameTestStructures } tasks.matching { it.name == 'runGameTestServer' }.configureEach { dependsOn prepareGameTestStructures + doFirst { + File runDirectory = layout.projectDirectory.dir('run-gametest').asFile + runDirectory.mkdirs() + + new File(runDirectory, 'server.properties').setText('online-mode=false\nmax-tick-time=-1\n', 'UTF-8') + File previousLog = new File(runDirectory, 'logs/latest.log') + if (previousLog.isFile()) { + File evidence = layout.buildDirectory.file("gametest-history/${System.currentTimeMillis()}.log").get().asFile + evidence.parentFile.mkdirs() + evidence.bytes = previousLog.bytes + previousLog.delete() + } + } + doLast { + File log = layout.projectDirectory.file('run-gametest/logs/latest.log').asFile + String text = log.isFile() ? log.getText('UTF-8') : '' + if (!(text =~ /All [1-9][0-9]* required tests passed/).find()) { + throw new GradleException('GameTests did not report a completed, passing suite. See run-gametest/logs/latest.log.') + } + if (text =~ /(?i)(ERROR|FATAL)\]/) { + throw new GradleException('GameTests logged an error. See run-gametest/logs/latest.log.') + } + } } 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 03b7a2a65..e6442e77d 100644 --- a/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java +++ b/src/dataGenerator/java/zone/moddev/mc/basemetals/data/GeneratedData.java @@ -1306,7 +1306,7 @@ private void saveConditionalRecipe(CachedOutput cache, JsonObject recipe, String } outputs.stream().filter(item -> item.startsWith("basemetals:")) .forEach(item -> conditions.add(object("type", "basemetals:content_mode", "item", item))); - recipe.add("conditions", conditions); + recipe.add("forge:condition", object("type", "forge:and", "values", conditions)); save(cache, recipe, "data/basemetals/recipes/" + id + ".json"); } @@ -1335,7 +1335,7 @@ private void writeAdvancements(CachedOutput cache) throws IOException { root.addProperty("parent", parent.contains(":") ? parent : "basemetals:" + parent); } JsonObject display = new JsonObject(); - display.add("icon", object("item", advancementIcon(id))); + display.add("icon", object("id", advancementIcon(id))); display.add("title", object("translate", "advancements.basemetals." + id + ".title")); display.add("description", object("translate", "advancements.basemetals." + id + ".description")); display.addProperty("frame", advancementFrame(id)); @@ -1538,7 +1538,7 @@ private void writeManifest(CachedOutput cache) throws IOException { JsonObject root = new JsonObject(); root.addProperty("format", 1); - root.addProperty("source", "Base Metals 1.20.1 catalogue"); + root.addProperty("source", "Base Metals 1.20.6 catalogue"); root.add("blocks", array(blocks)); root.add("items", array(items)); root.add("fluids", array(ModContent.fluids().keySet().stream().flatMap(id -> @@ -1700,7 +1700,7 @@ private void save(CachedOutput cache, JsonObject value, String relative) throws String id = relative.substring("data/basemetals/recipes/".length(), relative.length() - 5); String result = value.getAsJsonObject("result").get("item").getAsString(); net.minecraft.world.item.Item item = net.minecraftforge.registries.ForgeRegistries.ITEMS - .getValue(new ResourceLocation(result)); + .getValue(ResourceLocation.parse(result)); String category = switch (zone.moddev.mc.basemetals.ModTabs.category(item)) { case "blocks" -> "building"; case "tools", "combat" -> "equipment"; @@ -1711,9 +1711,46 @@ private void save(CachedOutput cache, JsonObject value, String relative) throws writeCraftingUnlock(cache, id, value); value = object("type", "basemetals:content_crafting", "recipe", value); } + if (relative.contains("/recipes/")) normalizeRecipeResults(value); + if (relative.contains("/advancements/") || relative.contains("/loot_tables/")) normalizePredicates(value); pendingWrites.add(DataProvider.saveStable(cache, value, output.resolve(relative))); } + private static void normalizeRecipeResults(JsonObject json) { + if (json.has("recipe") && json.get("recipe").isJsonObject()) { + normalizeRecipeResults(json.getAsJsonObject("recipe")); + } + String type = json.has("type") ? json.get("type").getAsString() : ""; + if (!type.startsWith("minecraft:") && !type.startsWith("basemetals:")) return; + if (!json.has("result")) return; + + JsonElement result = json.get("result"); + if (result.isJsonPrimitive()) { + json.add("result", object("id", result.getAsString())); + } else if (result.isJsonObject() && result.getAsJsonObject().has("item")) { + JsonObject stack = result.getAsJsonObject(); + stack.add("id", stack.remove("item")); + } + } + + private static void normalizePredicates(JsonElement value) { + if (value.isJsonArray()) { + value.getAsJsonArray().forEach(GeneratedData::normalizePredicates); + } else if (value.isJsonObject()) { + JsonObject object = value.getAsJsonObject(); + if (object.has("tag") && !object.has("type")) { + object.addProperty("items", "#" + object.remove("tag").getAsString()); + } + if (object.has("enchantments")) { + JsonObject predicates = object.has("predicates") + ? object.getAsJsonObject("predicates") : new JsonObject(); + predicates.add("minecraft:enchantments", object.remove("enchantments")); + object.add("predicates", predicates); + } + object.entrySet().forEach(entry -> normalizePredicates(entry.getValue())); + } + } + private static String materialName(JsonObject language, String material) { String legacyKey = "material." + material + ".name"; String key = language.has(legacyKey) ? legacyKey : "material.basemetals." + material; 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 bdac0ebfe..b71f94bf1 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/compat/CompatibilityRecipeGameTests.java @@ -5,28 +5,28 @@ import net.minecraft.gametest.framework.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraftforge.gametest.GameTestHolder; -import net.minecraftforge.gametest.PrefixGameTestTemplate; +import net.minecraftforge.gametest.GameTestDontPrefix; import net.minecraftforge.fml.ModList; /** Proves optional-mod serializers accept every packaged compatibility recipe. */ -@GameTestHolder(BaseMetals.MOD_ID) -@PrefixGameTestTemplate(false) +@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestDontPrefix public final class CompatibilityRecipeGameTests { private static final String EMPTY = "empty"; private CompatibilityRecipeGameTests() {} - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void thermalRecipesLoadWhenInstalled(GameTestHelper helper) { requireRecipeCount(helper, "thermal_expansion", "thermal", 130L); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void tinkersConstructRecipesLoadWhenInstalled(GameTestHelper helper) { requireRecipeCount(helper, "tconstruct", "tconstruct", 472L); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void enderIoRecipesLoadWhenInstalled(GameTestHelper helper) { requireRecipeCount(helper, "enderio", "enderio", 44L); } @@ -40,8 +40,8 @@ private static void requireRecipeCount(GameTestHelper helper, String modId, String pathPrefix = "compat/" + recipeFolder + "/"; long actual = helper.getLevel().getRecipeManager().getRecipes().stream() - .filter(recipe -> recipe.getId().getNamespace().equals(BaseMetals.MOD_ID)) - .filter(recipe -> recipe.getId().getPath().startsWith(pathPrefix)) + .filter(recipe -> recipe.id().getNamespace().equals(BaseMetals.MOD_ID)) + .filter(recipe -> recipe.id().getPath().startsWith(pathPrefix)) .count(); if (actual != expected) { helper.fail("Expected " + expected + " live " + modId diff --git a/src/gametest/java/zone/moddev/mc/basemetals/compat/MekanismGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/compat/MekanismGameTests.java deleted file mode 100644 index de5c3726e..000000000 --- a/src/gametest/java/zone/moddev/mc/basemetals/compat/MekanismGameTests.java +++ /dev/null @@ -1,49 +0,0 @@ -package zone.moddev.mc.basemetals.compat; - -import zone.moddev.mc.basemetals.BaseMetals; - -import mekanism.api.MekanismAPI; -import net.minecraft.gametest.framework.GameTest; -import net.minecraft.gametest.framework.GameTestHelper; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.gametest.GameTestHolder; -import net.minecraftforge.gametest.PrefixGameTestTemplate; -import net.minecraftforge.fml.ModList; - -/** Live registry and recipe checks for the optional Mekanism runtime. */ -@GameTestHolder(BaseMetals.MOD_ID) -@PrefixGameTestTemplate(false) -public final class MekanismGameTests { - private static final String EMPTY = "empty"; - - private MekanismGameTests() {} - - @GameTest(template = EMPTY) - public static void mekanismProcessingChainLoadsWhenInstalled(GameTestHelper helper) { - if (!ModList.get().isLoaded("mekanism")) { - helper.succeed(); - return; - } - - for (String material : MekanismCompat.PROCESSING_MATERIALS) { - require(helper, MekanismAPI.slurryRegistry().containsKey( - new ResourceLocation(BaseMetals.MOD_ID, "dirty_" + material)), - "Missing dirty Mekanism slurry for " + material); - require(helper, MekanismAPI.slurryRegistry().containsKey( - new ResourceLocation(BaseMetals.MOD_ID, "clean_" + material)), - "Missing clean Mekanism slurry for " + material); - } - - long recipes = helper.getLevel().getRecipeManager().getRecipes().stream() - .filter(recipe -> recipe.getId().getNamespace().equals(BaseMetals.MOD_ID)) - .filter(recipe -> recipe.getId().getPath().startsWith("compat/mekanism/")) - .count(); - require(helper, recipes == 88L, - "Expected 88 live Mekanism compatibility recipes, found " + recipes); - helper.succeed(); - } - - private static void require(GameTestHelper helper, boolean condition, String message) { - if (!condition) helper.fail(message); - } -} 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 990948c3a..8d55beaa5 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/BaseMetalsGameTests.java @@ -71,7 +71,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -79,21 +78,28 @@ import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.event.village.VillagerTradesEvent; import net.minecraftforge.gametest.GameTestHolder; -import net.minecraftforge.gametest.PrefixGameTestTemplate; +import net.minecraftforge.gametest.GameTestDontPrefix; import net.minecraftforge.registries.ForgeRegistries; /** Server-lifecycle checks which cannot safely run in a plain JUnit JVM. */ -@GameTestHolder(BaseMetals.MOD_ID) -@PrefixGameTestTemplate(false) +@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestDontPrefix public final class BaseMetalsGameTests { private static final String EMPTY = "empty"; private BaseMetalsGameTests() {} - @GameTest(template = EMPTY) + @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) public static void platesUseTheClickedFaceAndEdge(GameTestHelper helper) { PlateBlock plate = (PlateBlock) ModContent.blocksById().get("copper_plate").get(); - Player player = helper.makeMockPlayer(); + Player player = helper.makeMockPlayer(GameType.SURVIVAL); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); Map faceCentres = Map.of( @@ -136,7 +142,7 @@ Direction.WEST, new AABB(15.0D / 16.0D, 0, 0, 1, 1, 1), helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void humanDetectorIgnoresNonPlayers(GameTestHelper helper) { HumanDetectorBlock detector = (HumanDetectorBlock) ModContent.HUMAN_DETECTOR.get(); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); @@ -144,7 +150,7 @@ public static void humanDetectorIgnoresNonPlayers(GameTestHelper helper) { require(helper, detector.getSignalStrength(helper.getLevel(), position) == 0, "Human detector responded to a non-player entity"); - Player player = helper.makeMockPlayer(); + Player player = helper.makeMockPlayer(GameType.SURVIVAL); player.moveTo(position.getX() + 0.5D, position.getY() + 0.1D, position.getZ() + 0.5D); helper.getLevel().addFreshEntity(player); require(helper, detector.getSignalStrength(helper.getLevel(), position) == 15, @@ -153,30 +159,30 @@ public static void humanDetectorIgnoresNonPlayers(GameTestHelper helper) { helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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(new ResourceLocation(BaseMetals.MOD_ID, id)), + require(helper, !ForgeRegistries.ITEMS.containsKey(ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " unexpectedly has a block item"); } helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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( - new ResourceLocation(BaseMetals.MOD_ID, id)), id + " source fluid is not registered correctly"); + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " source fluid is not registered correctly"); require(helper, ForgeRegistries.FLUIDS.getKey(fluid.flowing().get()).equals( - new ResourceLocation(BaseMetals.MOD_ID, "flowing_" + id)), id + " flowing fluid is not registered correctly"); + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "flowing_" + id)), id + " flowing fluid is not registered correctly"); require(helper, ForgeRegistries.BLOCKS.getKey(fluid.block().get()).equals( - new ResourceLocation(BaseMetals.MOD_ID, id)), id + " fluid block is not registered correctly"); + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, id)), id + " fluid block is not registered correctly"); require(helper, ForgeRegistries.ITEMS.getKey(fluid.bucket().get()).equals( - new ResourceLocation(BaseMetals.MOD_ID, id + "_bucket")), id + " bucket is not registered correctly"); + ResourceLocation.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"); @@ -197,7 +203,7 @@ public static void everyFluidHasSourceFlowingBlockAndBucket(GameTestHelper helpe helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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(), @@ -225,7 +231,7 @@ public static void crushingRecipesLoadAndMatchOre(GameTestHelper helper) { helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void legacyFurnaceRecipesLoadAndRetainCountedOutputs(GameTestHelper helper) { MaterialCatalogue.ALL.forEach(material -> { assertSmeltingRecipeInTag(helper, @@ -261,7 +267,7 @@ public static void legacyFurnaceRecipesLoadAndRetainCountedOutputs(GameTestHelpe helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void stoneCrackhammerCraftsFromTheLegacyMiddleColumnPattern(GameTestHelper helper) { CraftingContainer crafting = craftingContainer(3, 3); crafting.setItem(1, new ItemStack(Blocks.STONE_BRICKS)); @@ -272,16 +278,16 @@ public static void stoneCrackhammerCraftsFromTheLegacyMiddleColumnPattern(GameTe RecipeType.CRAFTING, crafting, helper.getLevel()); require(helper, recipe.isPresent(), "Stone bricks above two sticks matched no crafting recipe"); if (recipe.isEmpty()) return; - require(helper, recipe.orElseThrow().getId().equals( - new ResourceLocation(BaseMetals.MOD_ID, "stone_crackhammer")), + require(helper, recipe.orElseThrow().id().equals( + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "stone_crackhammer")), "The legacy stone crackhammer pattern matched the wrong recipe"); - ItemStack output = recipe.orElseThrow().assemble(crafting, net.minecraft.core.RegistryAccess.EMPTY); + ItemStack output = recipe.orElseThrow().value().assemble(crafting, net.minecraft.core.RegistryAccess.EMPTY); require(helper, output.is(ModContent.item("stone_crackhammer").get()), "The legacy middle-column pattern returned the wrong item"); helper.succeed(); } - @GameTest(template = EMPTY, timeoutTicks = 250) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY, timeoutTicks = 250) public static void furnaceProcessesDustAndCountedLegacyRecovery(GameTestHelper helper) { BlockPos ironFurnacePosition = new BlockPos(1, 1, 1); BlockPos recoveryFurnacePosition = new BlockPos(2, 1, 1); @@ -307,7 +313,7 @@ public static void furnaceProcessesDustAndCountedLegacyRecovery(GameTestHelper h }); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void crackhammerBreaksOreIntoFixedOutput(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack hammer = ModContent.item("stone_crackhammer").get().getDefaultInstance(); @@ -327,7 +333,7 @@ public static void crackhammerBreaksOreIntoFixedOutput(GameTestHelper helper) { helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void crackhammerGroundCrushingUsesOneItemPerNormalUse(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack hammer = ModContent.item("stone_crackhammer").get().getDefaultInstance(); @@ -351,7 +357,7 @@ public static void crackhammerGroundCrushingUsesOneItemPerNormalUse(GameTestHelp helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void groundHammeringRawMetalsProducesOnePowder(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); @@ -384,7 +390,7 @@ public static void groundHammeringRawMetalsProducesOnePowder(GameTestHelper help helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void scytheHarvestsHorizontalThreeByThreeAndPaysDurability(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack scythe = ModContent.item("iron_scythe").get().getDefaultInstance(); @@ -414,7 +420,7 @@ public static void scytheHarvestsHorizontalThreeByThreeAndPaysDurability(GameTes helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void legacyToolAttributesAndFuelValuesSurviveThePort(GameTestHelper helper) { var bronze = MaterialCatalogue.get("bronze"); ItemStack hoe = ModContent.item("bronze_hoe").get().getDefaultInstance(); @@ -460,7 +466,7 @@ public static void legacyToolAttributesAndFuelValuesSurviveThePort(GameTestHelpe helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void crackhammerUsesLegacySpeedForEveryHarvestableCrushingInput(GameTestHelper helper) { ItemStack stoneHammer = ModContent.item("stone_crackhammer").get().getDefaultInstance(); float expected = ((MaterialBacked) stoneHammer.getItem()).baseMetalsMaterial() @@ -476,7 +482,7 @@ public static void crackhammerUsesLegacySpeedForEveryHarvestableCrushingInput(Ga helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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() @@ -500,13 +506,13 @@ public static void legacyBlockCapabilitiesSoundsAndQuartzInteractionSurvive(Game require(helper, ModContent.blocksById().get("stone_anvil").get().defaultBlockState() .getSoundType() == SoundType.STONE, "Stone anvil uses the wrong sound"); - Player player = helper.makeMockPlayer(); + Player player = helper.makeMockPlayer(GameType.SURVIVAL); for (String form : List.of("door", "trapdoor")) { BlockPos relative = form.equals("door") ? new BlockPos(1, 1, 1) : new BlockPos(2, 1, 1); BlockPos position = helper.absolutePos(relative); helper.setBlock(relative, ModContent.blocksById().get("quartz_" + form).get()); BlockState state = helper.getLevel().getBlockState(position); - InteractionResult result = state.use(helper.getLevel(), player, InteractionHand.MAIN_HAND, + InteractionResult result = state.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atCenterOf(position), Direction.UP, position, false)); require(helper, result.consumesAction(), "Quartz " + form + " cannot be opened by hand"); } @@ -514,13 +520,13 @@ public static void legacyBlockCapabilitiesSoundsAndQuartzInteractionSurvive(Game BlockPos diamondPosition = helper.absolutePos(diamondRelative); helper.setBlock(diamondRelative, ModContent.blocksById().get("diamond_door").get()); BlockState diamond = helper.getLevel().getBlockState(diamondPosition); - require(helper, diamond.use(helper.getLevel(), player, InteractionHand.MAIN_HAND, + require(helper, diamond.useWithoutItem(helper.getLevel(), player, new BlockHitResult(Vec3.atCenterOf(diamondPosition), Direction.UP, diamondPosition, false)) == InteractionResult.PASS, "Diamond door became hand-openable"); helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void customAnvilMenusRemainValidWithoutTheVanillaAnvilTag(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); BlockPos relative = new BlockPos(1, 1, 3); @@ -554,13 +560,14 @@ public static void customAnvilMenusRemainValidWithoutTheVanillaAnvilTag(GameTest helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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()); boolean found = trades.values().stream().flatMap(List::stream) - .map(listing -> listing.getOffer(null, net.minecraft.util.RandomSource.create(0L))) + .map(listing -> listing.getOffer(trader, net.minecraft.util.RandomSource.create(0L))) .anyMatch(offer -> offer != null && offer.getResult().is(ModContent.item("mercury_ingot").get()) && offer.getResult().getCount() == 12); @@ -568,7 +575,7 @@ public static void smithsRetainTheLegacyMercuryIngotSale(GameTestHelper helper) helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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"); @@ -581,25 +588,26 @@ public static void creativeTabsRetainTheirLegacyStarsteelIcons(GameTestHelper he helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper helper) { var recipe = helper.getLevel().getRecipeManager().byKey( - new ResourceLocation(BaseMetals.MOD_ID, "adamantine_chestplate_plate_repair")); + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "adamantine_chestplate_plate_repair")); require(helper, recipe.isPresent(), "Adamantine chestplate plate-repair recipe did not load"); if (recipe.isEmpty()) return; CraftingContainer crafting = craftingContainer(2, 1); ItemStack damaged = ModContent.item("adamantine_chestplate").get().getDefaultInstance(); damaged.setDamageValue(20); - damaged.enchant(Enchantments.ALL_DAMAGE_PROTECTION, 2); - damaged.setHoverName(net.minecraft.network.chat.Component.literal("Old name")); - damaged.getOrCreateTag().putBoolean("LegacyCustomData", true); + damaged.enchant(Enchantments.PROTECTION, 2); + damaged.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, net.minecraft.network.chat.Component.literal("Old name")); + net.minecraft.world.item.component.CustomData.update(net.minecraft.core.component.DataComponents.CUSTOM_DATA, + damaged, tag -> tag.putBoolean("LegacyCustomData", true)); crafting.setItem(0, damaged); crafting.setItem(1, ModContent.item("adamantine_plate").get().getDefaultInstance()); - require(helper, recipe.orElseThrow() instanceof PlateRepairRecipe, + require(helper, recipe.orElseThrow().value() instanceof PlateRepairRecipe, "Plate-repair recipe loaded with the wrong implementation"); - if (!(recipe.orElseThrow() instanceof PlateRepairRecipe repair)) return; + if (!(recipe.orElseThrow().value() instanceof PlateRepairRecipe repair)) return; require(helper, repair.matches(crafting, helper.getLevel()), "Plate-repair recipe rejected a damaged item and matching plate"); ItemStack output = repair.assemble(crafting, net.minecraft.core.RegistryAccess.EMPTY); @@ -607,22 +615,23 @@ public static void plateRepairKeepsAllItemDataAndResetsDamage(GameTestHelper hel "Plate repair returned the wrong armor item"); require(helper, output.getDamageValue() == 0, "Plate repair did not fully restore durability"); require(helper, EnchantmentHelper.getItemEnchantmentLevel( - Enchantments.ALL_DAMAGE_PROTECTION, output) == 2, + Enchantments.PROTECTION, output) == 2, "Plate repair lost enchantments"); - require(helper, output.hasCustomHoverName(), "Plate repair lost the custom name"); - require(helper, output.getOrCreateTag().getBoolean("LegacyCustomData"), + 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"), "Plate repair lost custom item data"); helper.succeed(); } - @GameTest(template = EMPTY) - public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsOnlyEnchantments(GameTestHelper helper) { + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) + public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsItemData(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack shield = ModContent.item("copper_shield").get().getDefaultInstance(); shield.setDamageValue(10); shield.enchant(Enchantments.UNBREAKING, 2); - shield.setHoverName(net.minecraft.network.chat.Component.literal("Old shield")); - shield.getOrCreateTag().putBoolean("LegacyCustomData", true); + shield.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, net.minecraft.network.chat.Component.literal("Old shield")); + net.minecraft.world.item.component.CustomData.update(net.minecraft.core.component.DataComponents.CUSTOM_DATA, + shield, tag -> tag.putBoolean("LegacyCustomData", true)); AnvilUpdateEvent event = new AnvilUpdateEvent(shield, ModContent.item("iron_plate").get().getDefaultInstance(), "", 0, player); @@ -634,15 +643,16 @@ public static void shieldUpgradeSupportsVanillaBitsPlatesAndKeepsOnlyEnchantment "Shield upgrade did not produce a fresh shield"); require(helper, EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, event.getOutput()) == 2, "Shield upgrade lost enchantments"); - require(helper, !event.getOutput().hasCustomHoverName(), - "Shield upgrade retained unrelated custom-name NBT"); - require(helper, !event.getOutput().getOrCreateTag().contains("LegacyCustomData"), - "Shield upgrade retained unrelated custom data"); + require(helper, event.getOutput().has(net.minecraft.core.component.DataComponents.CUSTOM_NAME), + "Shield upgrade lost the custom name"); + require(helper, event.getOutput().getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, + net.minecraft.world.item.component.CustomData.EMPTY).copyTag().contains("LegacyCustomData"), + "Shield upgrade lost its custom data"); require(helper, event.getMaterialCost() == 1, "Shield upgrade did not consume exactly one plate"); helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = 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(); @@ -692,7 +702,7 @@ public static void bowsAndLegacyCrossbowsUseOnlyTheirOwnAmmunition(GameTestHelpe helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void vanillaBitsEquipmentUsesItsActualMaterialForAnvilRepair(GameTestHelper helper) { ItemStack diamondBow = ModContent.item("diamond_bow").get().getDefaultInstance(); ItemStack emeraldSword = ModContent.item("emerald_sword").get().getDefaultInstance(); @@ -715,7 +725,7 @@ public static void vanillaBitsEquipmentUsesItsActualMaterialForAnvilRepair(GameT helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void armorToolEffectsAndStarsteelRegenerationAreServerAuthoritative(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); equip(player, "adamantine"); @@ -751,7 +761,7 @@ public static void armorToolEffectsAndStarsteelRegenerationAreServerAuthoritativ helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void remainingLegacyArmorEffectsUseTheCorrectPieceCounts(GameTestHelper helper) { BaseMetalsEvents events = new BaseMetalsEvents(); @@ -791,7 +801,7 @@ public static void remainingLegacyArmorEffectsUseTheCorrectPieceCounts(GameTestH helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void remainingLegacyMeleeEffectsUseTargetIdentity(GameTestHelper helper) { BaseMetalsEvents events = new BaseMetalsEvents(); ServerPlayer player = survivalPlayer(helper); @@ -827,10 +837,11 @@ public static void remainingLegacyMeleeEffectsUseTargetIdentity(GameTestHelper h helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void eventBackedAdvancementsAwardForActualLegacyActions(GameTestHelper helper) { ServerPlayer player = new ServerPlayer(helper.getLevel().getServer(), helper.getLevel(), - new GameProfile(UUID.randomUUID(), "basemetals-advancement-test")); + new GameProfile(UUID.randomUUID(), "basemetals-advancement-test"), + net.minecraft.server.level.ClientInformation.createDefault()); player.setGameMode(GameType.SURVIVAL); BaseMetalsEvents events = new BaseMetalsEvents(); events.onItemCrafted(new PlayerEvent.ItemCraftedEvent(player, @@ -841,8 +852,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().getAdvancement( - new ResourceLocation(BaseMetals.MOD_ID, advancement)); + var definition = player.getServer().getAdvancements().get( + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, advancement)); require(helper, definition != null && player.getAdvancements().getOrStartProgress(definition).isDone(), "Legacy action did not award advancement " + advancement); @@ -855,11 +866,11 @@ private static void assertCrushingRecipe(GameTestHelper helper, ItemStack input, var recipe = helper.getLevel().getRecipeManager().getRecipeFor( CrushingRecipe.TYPE.get(), new SimpleContainer(input), helper.getLevel()); require(helper, recipe.isPresent(), "No crushing recipe loaded for " + input); - ItemStack result = recipe.orElseThrow().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); + ItemStack result = recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); ResourceLocation expectedId = expectedItem.contains(":") - ? new ResourceLocation(expectedItem) - : new ResourceLocation(BaseMetals.MOD_ID, expectedItem); - require(helper, ForgeRegistries.ITEMS.getKey(recipe.orElseThrow().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getItem()).equals( + ? 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( expectedId), input + " crushed to the wrong output"); require(helper, result.getCount() == expectedCount, input + " crushed to " + result.getCount() + " items instead of " + expectedCount); @@ -870,7 +881,7 @@ private static void tickEffects(BaseMetalsEvents events, ServerPlayer player) { events.onPlayerTick(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player)); } - private static int effectAmplifier(LivingEntity entity, net.minecraft.world.effect.MobEffect effect) { + private static int effectAmplifier(LivingEntity entity, net.minecraft.core.Holder effect) { MobEffectInstance instance = entity.getEffect(effect); return instance == null ? -1 : instance.getAmplifier(); } @@ -881,9 +892,9 @@ private static void assertSmeltingRecipe(GameTestHelper helper, ItemStack input, RecipeType.SMELTING, new SimpleContainer(input), helper.getLevel()); require(helper, recipe.isPresent(), "No furnace recipe loaded for " + input); if (recipe.isEmpty()) return; - ItemStack result = recipe.orElseThrow().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); + ItemStack result = recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); ResourceLocation actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); - require(helper, actualItem.equals(new ResourceLocation(expectedItem)), + require(helper, actualItem.equals(ResourceLocation.parse(expectedItem)), input + " smelted to " + actualItem + " instead of " + expectedItem); require(helper, result.getCount() == expectedCount, input + " smelted to " + result.getCount() + " items instead of " + expectedCount); @@ -895,9 +906,9 @@ private static void assertSmeltingRecipeInTag(GameTestHelper helper, ItemStack i RecipeType.SMELTING, new SimpleContainer(input), helper.getLevel()); require(helper, recipe.isPresent(), "No furnace recipe loaded for " + input); if (recipe.isEmpty()) return; - ItemStack result = recipe.orElseThrow().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); + ItemStack result = recipe.orElseThrow().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY); TagKey tag = TagKey.create( - net.minecraft.core.registries.Registries.ITEM, new ResourceLocation(expectedTag)); + net.minecraft.core.registries.Registries.ITEM, ResourceLocation.parse(expectedTag)); ResourceLocation actualItem = ForgeRegistries.ITEMS.getKey(result.getItem()); require(helper, result.is(tag), input + " smelted to " + actualItem + ", which is outside #" + expectedTag); @@ -914,7 +925,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( - new ResourceLocation(expectedItem)), description + " used the wrong item"); + ResourceLocation.parse(expectedItem)), description + " used the wrong item"); require(helper, stack.getCount() == expectedCount, description + " contained " + stack.getCount() + " items instead of " + expectedCount); } @@ -927,21 +938,26 @@ 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( - new ResourceLocation(BaseMetals.MOD_ID, expectedItem)), "Crushing produced the wrong item"); + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, expectedItem)), "Crushing produced the wrong item"); require(helper, output.getCount() == expectedCount, "Crushing produced " + output.getCount() + " items instead of " + expectedCount); } private static ServerPlayer survivalPlayer(GameTestHelper helper) { - ServerPlayer player = FakePlayerFactory.get(helper.getLevel(), - new GameProfile(UUID.randomUUID(), "basemetals-crushing-test")); + var cookie = net.minecraft.server.network.CommonListenerCookie.createInitial( + new GameProfile(UUID.randomUUID(), "BMTest"), false); + ServerPlayer player = new ServerPlayer(helper.getLevel().getServer(), helper.getLevel(), + cookie.gameProfile(), cookie.clientInformation()); + var connection = new net.minecraft.network.Connection(net.minecraft.network.protocol.PacketFlow.SERVERBOUND); + new io.netty.channel.embedded.EmbeddedChannel(connection); + helper.getLevel().getServer().getPlayerList().placeNewPlayer(connection, player, cookie); player.setGameMode(GameType.SURVIVAL); return player; } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void projectilesRetainAmmunitionAcrossSaveAndSpawnData(GameTestHelper helper) { - Player shooter = helper.makeMockPlayer(); + Player shooter = helper.makeMockPlayer(GameType.SURVIVAL); ItemStack ammunition = ModContent.item("starsteel_bolt").get().getDefaultInstance(); MaterialProjectile original = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel(), shooter, ammunition); require(helper, original.getAddEntityPacket().getClass().getName().contains("CustomPayload"), @@ -951,7 +967,7 @@ public static void projectilesRetainAmmunitionAcrossSaveAndSpawnData(GameTestHel original.addAdditionalSaveData(saved); MaterialProjectile loaded = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); loaded.readAdditionalSaveData(saved); - require(helper, ItemStack.isSameItemSameTags(ammunition, loaded.getItem()), + require(helper, ItemStack.isSameItemSameComponents(ammunition, loaded.getItem()), "Projectile ammunition was not retained through save/load"); FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer()); @@ -959,7 +975,7 @@ public static void projectilesRetainAmmunitionAcrossSaveAndSpawnData(GameTestHel original.writeSpawnData(buffer); MaterialProjectile spawned = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); spawned.readSpawnData(buffer); - require(helper, ItemStack.isSameItemSameTags(ammunition, spawned.getItem()), + require(helper, ItemStack.isSameItemSameComponents(ammunition, spawned.getItem()), "Projectile ammunition was not retained through spawn data"); } finally { buffer.release(); @@ -978,14 +994,14 @@ public boolean stillValid(Player player) { }, width, height); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void oreLootSupportsRawFortuneSilkTouchAndHammering(GameTestHelper helper) { ServerPlayer player = survivalPlayer(helper); ItemStack pickaxe = Items.NETHERITE_PICKAXE.getDefaultInstance(); ItemStack silk = pickaxe.copy(); silk.enchant(Enchantments.SILK_TOUCH, 1); ItemStack fortune = pickaxe.copy(); - fortune.enchant(Enchantments.BLOCK_FORTUNE, 3); + fortune.enchant(Enchantments.FORTUNE, 3); BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); for (var entry : ModContent.blocksById().entrySet()) { if (!entry.getKey().endsWith("_ore")) continue; @@ -1023,7 +1039,7 @@ public static void oreLootSupportsRawFortuneSilkTouchAndHammering(GameTestHelper helper.succeed(); } - @GameTest(template = EMPTY) + @GameTest(batch = BaseMetals.MOD_ID, template = EMPTY) public static void fullyDrawnWeaponsApplyMaterialDamageBeforePower(GameTestHelper helper) { for (String material : List.of("gold", "steel", "adamantine")) { for (boolean crossbow : List.of(false, true)) { @@ -1033,7 +1049,7 @@ public static void fullyDrawnWeaponsApplyMaterialDamageBeforePower(GameTestHelpe String launcher = material + (crossbow ? "_crossbow" : "_bow"); String ammo = material + (crossbow ? "_bolt" : "_arrow"); ItemStack weapon = ModContent.item(launcher).get().getDefaultInstance(); - if (power > 0) weapon.enchant(Enchantments.POWER_ARROWS, power); + if (power > 0) weapon.enchant(Enchantments.POWER, power); player.setItemInHand(InteractionHand.MAIN_HAND, weapon); player.getInventory().setItem(1, ModContent.item(ammo).get().getDefaultInstance()); player.startUsingItem(InteractionHand.MAIN_HAND); @@ -1055,9 +1071,11 @@ public static void fullyDrawnWeaponsApplyMaterialDamageBeforePower(GameTestHelpe helper.succeed(); } - private static double attribute(ItemStack stack, Attribute attribute) { - return stack.getAttributeModifiers(EquipmentSlot.MAINHAND).get(attribute).stream() - .mapToDouble(AttributeModifier::getAmount).sum(); + private static double attribute(ItemStack stack, net.minecraft.core.Holder attribute) { + return stack.getOrDefault(net.minecraft.core.component.DataComponents.ATTRIBUTE_MODIFIERS, + net.minecraft.world.item.component.ItemAttributeModifiers.EMPTY).modifiers().stream() + .filter(entry -> entry.slot().test(EquipmentSlot.MAINHAND) && entry.attribute().equals(attribute)) + .mapToDouble(entry -> entry.modifier().amount()).sum(); } private static int burnTime(String item) { diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java index 0cfb1aea7..a858ff972 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/ForwardPortGameTests.java @@ -11,22 +11,20 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.ArrowItem; import net.minecraft.world.entity.projectile.AbstractArrow; -import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.gametest.GameTestHolder; -import net.minecraftforge.gametest.PrefixGameTestTemplate; +import net.minecraftforge.gametest.GameTestDontPrefix; import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.material.MaterialCatalogue; import zone.moddev.mc.basemetals.recipe.CrushingRecipe; -@GameTestHolder(BaseMetals.MOD_ID) -@PrefixGameTestTemplate(false) +@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestDontPrefix public final class ForwardPortGameTests { private ForwardPortGameTests() {} - @GameTest(template = "empty") + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") public static void everyRangedMaterialContributesItsDamage(GameTestHelper helper) { - var player = FakePlayerFactory.get(helper.getLevel(), - new GameProfile(UUID.randomUUID(), "ranged-material-test")); + var player = helper.makeMockServerPlayerInLevel(); int checked = 0; for (var entry : ModContent.itemsById().entrySet()) { if (!entry.getKey().endsWith("_bow")) continue; @@ -51,7 +49,7 @@ public static void everyRangedMaterialContributesItsDamage(GameTestHelper helper helper.succeed(); } - @GameTest(template = "empty") + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") public static void rawCrushingAndSilkTouchInventoriesRemainSeparate(GameTestHelper helper) { int checked = 0; for (var material : MaterialCatalogue.ALL) { @@ -60,18 +58,18 @@ public static void rawCrushingAndSilkTouchInventoriesRemainSeparate(GameTestHelp : ModContent.item(material.name() + "_raw").get().getDefaultInstance(); var crushed = helper.getLevel().getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), new SimpleContainer(raw), helper.getLevel()).orElseThrow(); - require(helper, crushed.getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getCount() == 1, material.name() + " raw material was doubled"); + require(helper, crushed.value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getCount() == 1, material.name() + " raw material was doubled"); var ore = helper.getLevel().getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), new SimpleContainer(ModContent.item(material.name() + "_ore").get().getDefaultInstance()), helper.getLevel()).orElseThrow(); - require(helper, ore.getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getCount() == 2, material.name() + " ore hammer yield changed"); + require(helper, ore.value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).getCount() == 2, material.name() + " ore hammer yield changed"); checked++; } require(helper, checked == 13, "Expected all 13 ore-bearing materials"); helper.succeed(); } - @GameTest(template = "empty") + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") public static void thinTransparentBlocksDoNotHideTheirNeighbours(GameTestHelper helper) { BlockPos position = helper.absolutePos(new BlockPos(1, 1, 1)); for (var entry : ModContent.blocksById().entrySet()) { diff --git a/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java b/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java new file mode 100644 index 000000000..b76aa0dd1 --- /dev/null +++ b/src/gametest/java/zone/moddev/mc/basemetals/content/NativeComponentGameTests.java @@ -0,0 +1,79 @@ +package zone.moddev.mc.basemetals.content; + +import io.netty.buffer.Unpooled; +import net.minecraft.core.component.DataComponents; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraftforge.gametest.GameTestDontPrefix; +import net.minecraftforge.gametest.GameTestHolder; +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) +@GameTestDontPrefix +public final class NativeComponentGameTests { + private NativeComponentGameTests() {} + + @GameTest(batch = BaseMetals.MOD_ID, template = "empty", timeoutTicks = 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; + RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), helper.getLevel().registryAccess()); + try { + Recipe.STREAM_CODEC.encode(buffer, holder.value()); + 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()); + helper.assertTrue(decoded.isSpecial() == holder.value().isSpecial(), "Recipe discovery changed: " + holder.id()); + checked++; + } finally { + buffer.release(); + } + } + helper.assertTrue(checked > 2000, "The native recipe round-trip did not cover the catalogue"); + helper.succeed(); + } + + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") + public static void oldEmbeddedBoltsKeepTheirCustomItemData(GameTestHelper helper) { + CompoundTag ammunition = new CompoundTag(); + ammunition.putString("id", "basemetals:adamantine_bolt"); + ammunition.putByte("Count", (byte) 1); + CompoundTag data = new CompoundTag(); + data.putInt("Proof", 147); + CompoundTag display = new CompoundTag(); + display.putString("Name", "{\"text\":\"An old bolt\"}"); + ListTag lore = new ListTag(); + lore.add(StringTag.valueOf("{\"text\":\"Saved before components\"}")); + display.put("Lore", lore); + data.put("display", display); + ammunition.put("tag", data); + CompoundTag entity = new CompoundTag(); + entity.put("Ammunition", ammunition); + + MaterialProjectile projectile = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); + projectile.readAdditionalSaveData(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, + "An old bolt lost custom data"); + CompoundTag saved = new CompoundTag(); + projectile.addAdditionalSaveData(saved); + MaterialProjectile reloaded = new MaterialProjectile(ModEntities.CUSTOM_BOLT.get(), helper.getLevel()); + reloaded.readAdditionalSaveData(saved); + helper.assertTrue(net.minecraft.world.item.ItemStack.matches(item, reloaded.getItem()), "A converted bolt changed on reload"); + helper.succeed(); + } +} 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 1015ab828..2298c7ec8 100644 --- a/src/gametest/java/zone/moddev/mc/basemetals/migration/MigrationGameTests.java +++ b/src/gametest/java/zone/moddev/mc/basemetals/migration/MigrationGameTests.java @@ -14,15 +14,15 @@ import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraftforge.gametest.GameTestHolder; -import net.minecraftforge.gametest.PrefixGameTestTemplate; +import net.minecraftforge.gametest.GameTestDontPrefix; /** Direct coverage of the pre-flattening overlay around Mojang's data fixer. */ -@GameTestHolder(BaseMetals.MOD_ID) -@PrefixGameTestTemplate(false) +@GameTestHolder(value = BaseMetals.MOD_ID, namespace = BaseMetals.MOD_ID) +@GameTestDontPrefix public final class MigrationGameTests { private MigrationGameTests() {} - @GameTest(template = "empty") + @GameTest(batch = BaseMetals.MOD_ID, template = "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,7 +37,7 @@ public static void floorAndCeilingLeversKeepTheirLegacyOrientation(GameTestHelpe helper.succeed(); } - @GameTest(template = "empty") + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") public static void vanillaFixesAndMmdlibStatesSurviveTheSameChunkConversion(GameTestHelper helper) { try { CompoundTag converted = Legacy112WorldMigrator.convertChunkForTest(legacyChunk(1_343), legacyIds()); @@ -105,7 +105,7 @@ public static void vanillaFixesAndMmdlibStatesSurviveTheSameChunkConversion(Game helper.succeed(); } - @GameTest(template = "empty") + @GameTest(batch = BaseMetals.MOD_ID, template = "empty") public static void mmdForge110ChunksUseTheCompleteFlatteningPath(GameTestHelper helper) { try { CompoundTag converted = Legacy112WorldMigrator.convertChunkForTest(legacyChunk(512), legacyIds()); diff --git a/src/generated/resources/data/basemetals/advancements/angel_of_death.json b/src/generated/resources/data/basemetals/advancements/angel_of_death.json index 1d972560a..1006ae4b7 100644 --- a/src/generated/resources/data/basemetals/advancements/angel_of_death.json +++ b/src/generated/resources/data/basemetals/advancements/angel_of_death.json @@ -12,7 +12,7 @@ }, "frame": "challenge", "icon": { - "item": "basemetals:mithril_sword" + "id": "basemetals:mithril_sword" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/aquarium_maker.json b/src/generated/resources/data/basemetals/advancements/aquarium_maker.json index fbc9f7a75..198c7dfca 100644 --- a/src/generated/resources/data/basemetals/advancements/aquarium_maker.json +++ b/src/generated/resources/data/basemetals/advancements/aquarium_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:aquarium_blend" + "id": "basemetals:aquarium_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/blocktastic.json b/src/generated/resources/data/basemetals/advancements/blocktastic.json index fdce82fec..b41ccaf74 100644 --- a/src/generated/resources/data/basemetals/advancements/blocktastic.json +++ b/src/generated/resources/data/basemetals/advancements/blocktastic.json @@ -12,7 +12,7 @@ }, "frame": "task", "icon": { - "item": "basemetals:copper_block" + "id": "basemetals:copper_block" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/brass_maker.json b/src/generated/resources/data/basemetals/advancements/brass_maker.json index 09cb4b805..4918c6e4c 100644 --- a/src/generated/resources/data/basemetals/advancements/brass_maker.json +++ b/src/generated/resources/data/basemetals/advancements/brass_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:brass_blend" + "id": "basemetals:brass_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/bronze_maker.json b/src/generated/resources/data/basemetals/advancements/bronze_maker.json index 60e68e33e..8e48f31f1 100644 --- a/src/generated/resources/data/basemetals/advancements/bronze_maker.json +++ b/src/generated/resources/data/basemetals/advancements/bronze_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:bronze_blend" + "id": "basemetals:bronze_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/cupronickel_maker.json b/src/generated/resources/data/basemetals/advancements/cupronickel_maker.json index d46f4240c..e900d2d1b 100644 --- a/src/generated/resources/data/basemetals/advancements/cupronickel_maker.json +++ b/src/generated/resources/data/basemetals/advancements/cupronickel_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:cupronickel_blend" + "id": "basemetals:cupronickel_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/demon_slayer.json b/src/generated/resources/data/basemetals/advancements/demon_slayer.json index 915b2ebbc..ce575327c 100644 --- a/src/generated/resources/data/basemetals/advancements/demon_slayer.json +++ b/src/generated/resources/data/basemetals/advancements/demon_slayer.json @@ -12,7 +12,7 @@ }, "frame": "challenge", "icon": { - "item": "basemetals:coldiron_sword" + "id": "basemetals:coldiron_sword" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/electrum_maker.json b/src/generated/resources/data/basemetals/advancements/electrum_maker.json index c447eac8c..835c09147 100644 --- a/src/generated/resources/data/basemetals/advancements/electrum_maker.json +++ b/src/generated/resources/data/basemetals/advancements/electrum_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:electrum_blend" + "id": "basemetals:electrum_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/geologist.json b/src/generated/resources/data/basemetals/advancements/geologist.json index acd557c48..bd4aacf42 100644 --- a/src/generated/resources/data/basemetals/advancements/geologist.json +++ b/src/generated/resources/data/basemetals/advancements/geologist.json @@ -12,7 +12,7 @@ }, "frame": "task", "icon": { - "item": "basemetals:iron_crackhammer" + "id": "basemetals:iron_crackhammer" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/invar_maker.json b/src/generated/resources/data/basemetals/advancements/invar_maker.json index 43f50ee8f..363455424 100644 --- a/src/generated/resources/data/basemetals/advancements/invar_maker.json +++ b/src/generated/resources/data/basemetals/advancements/invar_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:invar_blend" + "id": "basemetals:invar_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/juggernaut.json b/src/generated/resources/data/basemetals/advancements/juggernaut.json index 27da53593..38c880ed0 100644 --- a/src/generated/resources/data/basemetals/advancements/juggernaut.json +++ b/src/generated/resources/data/basemetals/advancements/juggernaut.json @@ -12,7 +12,7 @@ }, "frame": "challenge", "icon": { - "item": "basemetals:adamantine_chestplate" + "id": "basemetals:adamantine_chestplate" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/metallurgy.json b/src/generated/resources/data/basemetals/advancements/metallurgy.json index aaac4d055..9c3a23ade 100644 --- a/src/generated/resources/data/basemetals/advancements/metallurgy.json +++ b/src/generated/resources/data/basemetals/advancements/metallurgy.json @@ -12,7 +12,7 @@ }, "frame": "task", "icon": { - "item": "basemetals:bronze_blend" + "id": "basemetals:bronze_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/mithril_maker.json b/src/generated/resources/data/basemetals/advancements/mithril_maker.json index 2b29bce9e..1b076243a 100644 --- a/src/generated/resources/data/basemetals/advancements/mithril_maker.json +++ b/src/generated/resources/data/basemetals/advancements/mithril_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:mithril_blend" + "id": "basemetals:mithril_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/moon_boots.json b/src/generated/resources/data/basemetals/advancements/moon_boots.json index ed2703e78..f4a7e0dd9 100644 --- a/src/generated/resources/data/basemetals/advancements/moon_boots.json +++ b/src/generated/resources/data/basemetals/advancements/moon_boots.json @@ -12,7 +12,7 @@ }, "frame": "challenge", "icon": { - "item": "basemetals:starsteel_boots" + "id": "basemetals:starsteel_boots" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/pewter_maker.json b/src/generated/resources/data/basemetals/advancements/pewter_maker.json index 341564a27..01a020ab2 100644 --- a/src/generated/resources/data/basemetals/advancements/pewter_maker.json +++ b/src/generated/resources/data/basemetals/advancements/pewter_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:pewter_blend" + "id": "basemetals:pewter_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json b/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json index fbc0fd166..e2c686e5c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json index 55ed7e8c0..96450c834 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/adamantine" + "items": "#forge:storage_blocks/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json index 939dc628d..1d22d9d62 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/adamantine" + "items": "#forge:nuggets/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json index 925ca4be5..c3a732543 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json index bce29572c..caa397389 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json index 136e0d58d..3d3c3d83d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json index 695ae4a63..11868fc74 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json index 4b4cd272f..eba64c555 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/adamantine" + "items": "#forge:storage_blocks/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json index 370cf56f2..00c90cd3a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json index 714be2803..c52f592e9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json index 9ec76ef2d..b0e3f37a8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json index 04bdbaf35..d952661d8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/adamantine" + "items": "#forge:nuggets/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json index a65907148..bf7dfc016 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json index adf774f28..e47547554 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/adamantine" + "items": "#forge:storage_blocks/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json index b9950b01e..d67a389ba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/adamantine" + "items": "#forge:gears/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json index 183042740..2089b7c1a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json index 3d5b51b2d..04ea81cda 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json index f20a30543..64f51fa44 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json index abf9103b8..52bcfe86c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json index ca19000b3..ac596f26b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json index 28f134b47..9ad2f243e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json index 959015e1a..339a36280 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/adamantine" + "items": "#forge:nuggets/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json index cb82762bb..637f4de3b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json index 45ec7b6d1..da9a99dca 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/adamantine" + "items": "#forge:rods/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json index 81b0416aa..72d28d897 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json index c5c17d2a6..125493aef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json index 085263b92..081e5a9f0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json index 638ed88bf..67b1486fe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/adamantine" + "items": "#forge:tiny_dusts/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json index e31475351..cc7c38981 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_blasting.json index e4cd51e39..d1fa289a6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/adamantine" + "items": "#forge:raw_materials/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_smelting.json index 6c4041fb4..823f51f7f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/adamantine" + "items": "#forge:raw_materials/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json index 1b6ca4b4f..4e5083182 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json index b8ee1a9b1..a7846d104 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json index fa1bbb482..946ec2899 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json index aaf34c7c3..52d9ee890 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json index 985e67795..bca304736 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json index b10fb7880..c35f07e88 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/adamantine" + "items": "#forge:storage_blocks/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json index fe36735f7..3beed53bf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/adamantine" + "items": "#forge:dusts/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json index a4beac532..cad76f00b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/adamantine" + "items": "#forge:storage_blocks/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json index 9b830993c..4e25eef4a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json index 725d82929..efd289083 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json index 397a49e8c..5f59dcd70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/adamantine" + "items": "#forge:storage_blocks/adamantine" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/adamantine" + "items": "#forge:ingots/adamantine" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json index d700fc6b2..7e816ae54 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/antimony" + "items": "#forge:nuggets/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json index e446ad1c2..0c795c3c6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json index abb5ba945..66e8c2223 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json index a04088567..0ba812f51 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json index 081ed8709..b7c9670a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json index e7cb2110c..c0f7155a1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/antimony" + "items": "#forge:storage_blocks/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json index a116133df..bcdfa6c4d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json index 0efa79e36..aeb837f44 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json index 4907a87ac..83b144dd8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json index c91e74d3e..76e43ae83 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/antimony" + "items": "#forge:nuggets/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json index eb4e7a218..3ce981b9a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json index 2c4e0e417..1782ba538 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/antimony" + "items": "#forge:storage_blocks/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json index 9235774f6..bd04e6bc8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/antimony" + "items": "#forge:gears/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json index a6f3eaf4d..456bb54d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json index 6ae76ebe1..cd324310a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json index be0786cd7..f3e74d7f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json index dc2840689..09f8d6c87 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json index 85a37de52..6b694050f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json index aebe9f66e..8f3ce8827 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json index f357fbefa..83b723e72 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/antimony" + "items": "#forge:nuggets/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json index 676c88918..b39875dac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json index 9c6433067..b0dd65869 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/antimony" + "items": "#forge:rods/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json index 7e1cedc05..f1412083a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json index f8a869eb2..3f5e59135 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json index 36f427f6e..bbd467f07 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json index 0ea14c64a..0fb7d9831 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/antimony" + "items": "#forge:tiny_dusts/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json index bd4e942ef..1b35a6c52 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_blasting.json index 29288ce32..09c65b02c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/antimony" + "items": "#forge:raw_materials/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_smelting.json index 5f0b068f6..104164479 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/antimony" + "items": "#forge:raw_materials/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json index 8d34929b8..4c2868b3a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json index 742e8d7f2..18dde23f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json index 1fab2c7c3..60aaa7ee1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json index 4e53074bb..0c8a7c325 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json index 226dfbf25..adc78bca3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json index ab7dc3a0b..37bd7edde 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/antimony" + "items": "#forge:storage_blocks/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json index 72bc805c8..d57cb82b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/antimony" + "items": "#forge:dusts/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json index a6a667559..ab7d4e9a5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/antimony" + "items": "#forge:storage_blocks/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json index d30aa3f77..754b7880e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json index 4a9df3df5..77ff5fcf1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json index d3272f3a3..588214cc8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/antimony" + "items": "#forge:storage_blocks/antimony" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/antimony" + "items": "#forge:ingots/antimony" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json index d7c16596f..6ff65e206 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/aquarium" + "items": "#forge:nuggets/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json index 30a43d282..05cc9d678 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json index 68eb19988..1cc208cd4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json index 820cfb7fb..97ec6eaa6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json index 93ac91f5d..ce17c0777 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/copper" + "items": "#forge:dusts/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/zinc" + "items": "#forge:dusts/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/prismarine" + "items": "#forge:dusts/prismarine" } ] }, @@ -35,7 +35,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json index 179e2159a..3d6c4cc9c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/aquarium" + "items": "#forge:small_blends/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json index 176c28b1d..75efbded1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json index 5e190e096..2ebe41869 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/aquarium" + "items": "#forge:storage_blocks/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json index f02ef2890..a3859d4e5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json index 4b769e7ec..b0af9391f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json index 79d600a49..a6ff8bd0e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json index 0889fe2e8..a775ab3e4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/aquarium" + "items": "#forge:nuggets/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json index 2d8cb53a7..35579a67d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json index d47b728d3..1d7cb925c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/aquarium" + "items": "#forge:storage_blocks/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json index 0d20738ea..7ee67a8f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/aquarium" + "items": "#forge:gears/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json index 1989be385..f13a40435 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json index 83bf64dad..e54f168c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json index 72075d514..84426d390 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json index 139916205..b8fa5b5e5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json index b866c5861..5b2de5133 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json index e160dc1b4..f2d736314 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json index c012e1b75..564a5afa0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/aquarium" + "items": "#forge:nuggets/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json index 164cdc4ab..1d7c07422 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json index 2d058b503..560de2f36 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/aquarium" + "items": "#forge:rods/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json index c3c2fc12a..858ef4155 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json index f3a4a1aca..d58760d7f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json index ffe2cb379..9f17a55a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json index 6917681cd..8f6b3fdd0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/aquarium" + "items": "#forge:tiny_dusts/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json index 45548b1e5..adab60dc9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json index ce03b6c66..3240b8108 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json index d2d3b39c7..388ef0ac1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json index 1eb3bc62a..0292e1583 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json index d2af6f400..853cb7e6b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json index a7b8308de..318834475 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json index 8bc4b186d..d6a56eec8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/aquarium" + "items": "#forge:storage_blocks/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json index c48e6b965..a0a5680d2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/aquarium" + "items": "#forge:blends/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json index d00b03d60..a3df77b73 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/aquarium" + "items": "#forge:dusts/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json index 5610adbfd..0ee6f8988 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/aquarium" + "items": "#forge:storage_blocks/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json index 53261563d..13de7b07b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json index 73195c4b8..49c3bc861 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json index bd378266f..767ee3673 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/aquarium" + "items": "#forge:storage_blocks/aquarium" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/aquarium" + "items": "#forge:ingots/aquarium" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json index 4afdbfeaf..41d9c00d5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/bismuth" + "items": "#forge:nuggets/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json index cd9348c47..f7763810d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json index 36fcb195f..67edd2ed8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json index 337da9f83..23fdd749d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json index 9a82fada0..0b6533233 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json index 158b33f4f..196bb2467 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bismuth" + "items": "#forge:storage_blocks/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json index c58b26ad3..315d0b773 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json index 7cef1c4ed..1ce6234ce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json index 128a0862a..acd0fdc89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json index 7a0d5209b..b859fc70a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/bismuth" + "items": "#forge:nuggets/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json index 2954dfa10..19056c9ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json index 303f220e2..3be96100d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bismuth" + "items": "#forge:storage_blocks/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json index 7acc8156c..7f7b00b3e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/bismuth" + "items": "#forge:gears/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json index 9fb1a2026..f1783240a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json index 1652cb459..1f34e28ae 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json index 4dbe46ef6..cfed918c4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json index 86ed7ce23..0bfbda474 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json index 6e7108d65..ce36225d8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json index b998c90a0..1707bfa06 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json index 580170b0c..781ee23a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/bismuth" + "items": "#forge:nuggets/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json index d5681f198..79abce5dc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json index 53848aa6a..31b08b48c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bismuth" + "items": "#forge:rods/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json index c32caba44..64ae4d1de 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json index 48fcb5100..bfa050bee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json index 2ea771c1a..a9bbbd840 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json index ea8f6df2b..e40535f12 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/bismuth" + "items": "#forge:tiny_dusts/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json index bedddf44f..48300ed70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_blasting.json index 1c07e19b2..431e31e6a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/bismuth" + "items": "#forge:raw_materials/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_smelting.json index ca85c6e90..7d623fd48 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/bismuth" + "items": "#forge:raw_materials/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json index 884baf10f..0f224d3de 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json index 30b37b36f..901f5d007 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json index 610357716..d6de1e211 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json index 6ec49509c..ca85fc4dd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json index ff89cddcc..cdd383fff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json index dc5185244..61f8fa450 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bismuth" + "items": "#forge:storage_blocks/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json index 3f1f0f4e6..8ac244397 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/bismuth" + "items": "#forge:dusts/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json index 555ccdd4a..d8ec41744 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bismuth" + "items": "#forge:storage_blocks/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json index 46314c4ad..e4fe35282 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json index 0434f424f..6bacb317e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json index e302c2adc..d66c6159d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bismuth" + "items": "#forge:storage_blocks/bismuth" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bismuth" + "items": "#forge:ingots/bismuth" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json index 6d8035682..9c3ebdea7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/brass" + "items": "#forge:nuggets/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json index 9e4567cb7..4b216cd6d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json index 4fd11b98b..25cf8a4e7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json index 4a1e52b57..52380daa0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json index 632fb2c9e..76215bb62 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/copper" + "items": "#forge:dusts/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/zinc" + "items": "#forge:dusts/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json index ea3c87424..45e7f011a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/brass" + "items": "#forge:small_blends/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json index 0dbb2da0d..ebbe0fe63 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json index 2e1e677f9..e9494d963 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/brass" + "items": "#forge:storage_blocks/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json index 7efa3973e..eb5d29f85 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json index 042b36689..82a893aeb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json index 81af272ad..c4e76d5a9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json index 980758504..77005a6e1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/brass" + "items": "#forge:nuggets/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json index 49d6fbbbb..8ed68edc9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json index 8c486099e..71d7b8b38 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/brass" + "items": "#forge:storage_blocks/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json index b90e0a28c..44c734322 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/brass" + "items": "#forge:gears/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json index 286669e4d..11cfbec81 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json index 4c49dc5ca..89c99248c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json index a2313bccb..c01aa8688 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json index f405d9afe..815f1bfcd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json index b29fac58f..262234b87 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json index 5eeaab392..ca8157ca1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json index a075d840b..22cb1b9bb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/brass" + "items": "#forge:nuggets/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json index 426a8c93d..abaabee89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json index 68139cfe7..c478dfe32 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/brass" + "items": "#forge:rods/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json index bb7447d36..6bf7caa8a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json index ebef4bbaa..f6d95de52 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json index d09550d11..0ffa70cd6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json index 737015850..98b6524c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/brass" + "items": "#forge:tiny_dusts/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json index ff0ab283e..b4a8bc6f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json index 78ab6ea22..0c9e5592e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json index cf06c9c2b..a165646e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json index 4b580e0a8..6c7a045cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json index 0de687e66..eed0e0eef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json index 9ea312e00..4300d6cd9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json index 2a8d204ed..f1daf3087 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/brass" + "items": "#forge:storage_blocks/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json index 3f437e317..d37657407 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/brass" + "items": "#forge:blends/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json index 944b76dc0..75ff10218 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/brass" + "items": "#forge:dusts/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json index ba9720da3..06f597eeb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/brass" + "items": "#forge:storage_blocks/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json index 5596a013f..72b0cc93d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json index daa6fd700..f58ddc80c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json index 263eaab51..bc945ad25 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/brass" + "items": "#forge:storage_blocks/brass" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": "#forge:ingots/brass" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json index 20f1df522..37c696c03 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/bronze" + "items": "#forge:nuggets/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json index a165ed7d5..73b618bfd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json index 79a131de4..0d2477ee2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json index d05fc7fa1..12d0df50b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json index 76dcc709e..3fdeec464 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/copper" + "items": "#forge:dusts/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/tin" + "items": "#forge:dusts/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json index cb4b421e8..540d988a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/bronze" + "items": "#forge:small_blends/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json index 7c720cbc2..f5ca84b58 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json index 37d394db9..e87c58eac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bronze" + "items": "#forge:storage_blocks/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json index 3dae36748..c14bd08f5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json index 72fd1c068..3bcedd82e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json index d3d4c2cce..0557a563a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json index 7035cae21..75f4ed041 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/bronze" + "items": "#forge:nuggets/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json index 991a42867..6ea150396 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json index 75c369ee9..eec3f24cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bronze" + "items": "#forge:storage_blocks/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json index 9e3c5016e..9d72c0e4f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/bronze" + "items": "#forge:gears/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json index 929bee243..8c6691673 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json index 58505a9c6..1b8175676 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json index 4efbea9c2..b6e9ed484 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json index eb1d2fc7c..9feed6fa8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json index a0ed65d3b..9cb49d459 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json index f73f4589e..e075db997 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json index 75563d5dc..ca0c96ea3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/bronze" + "items": "#forge:nuggets/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json index 633b7365b..daec34227 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json index 47f0a683b..953efe4b1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/bronze" + "items": "#forge:rods/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json index 91ab58a41..3061df40b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json index 2fa6c79ef..b470bae82 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json index 685ac6afb..4d22e3129 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json index 808fa2398..95f566b33 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/bronze" + "items": "#forge:tiny_dusts/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json index fa62a26c6..70dfa2494 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json index 0ccfdbd75..00685fd84 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json index 835bdd081..895c761ef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json index 40e5a0188..f78532dbf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json index 33226deed..8daf5299b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json index b1f8228f8..ba1ce6b56 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json index 7b88750f2..1f56e8c7d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bronze" + "items": "#forge:storage_blocks/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json index b11853614..849838106 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/bronze" + "items": "#forge:blends/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json index 1868f43ca..c049a4196 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/bronze" + "items": "#forge:dusts/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json index 0ca3e0dc9..427a7cd2d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bronze" + "items": "#forge:storage_blocks/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json index ea03ebdfa..686ad88f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json index e33460d64..bb8a30c05 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json index 6c87f5862..429f51b5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/bronze" + "items": "#forge:storage_blocks/bronze" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/bronze" + "items": "#forge:ingots/bronze" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json index 5a38a57ab..fe641ff20 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/charcoal" + "items": "#forge:dusts/charcoal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json index 8fd9bcd3f..2831adc3b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/charcoal" + "items": "#forge:nuggets/charcoal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json index 46eb5c5e4..cfc932a81 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/charcoal" + "items": "#forge:tiny_dusts/charcoal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json index a10824d98..f96e1502f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/charcoal" + "items": "#forge:dusts/charcoal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json index 5c8c31a22..e21e78c9b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/coal" + "items": "#forge:dusts/coal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json index 72b0212bd..bc182fea1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/coal" + "items": "#forge:nuggets/coal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json index 805daa4ee..33e54fc04 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/coal" + "items": "#forge:tiny_dusts/coal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json index d7bea89c0..ab244b261 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/coal" + "items": "#forge:dusts/coal" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json index 035a733db..18a4cceea 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/coldiron" + "items": "#forge:nuggets/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json index 44f347223..1a2882243 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json index 7d36fb36e..a0bce01f1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json index 0088b45a1..32835b94f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json index 434835dd4..a94695d2a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json index 7242872f3..38f46d7a8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/coldiron" + "items": "#forge:storage_blocks/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json index b73e0d19b..3c683ac99 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json index 935e4eed3..f0e996f61 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json index 57aadc4d8..e9ac1af5c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json index 05b54ed98..b6e1ad942 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/coldiron" + "items": "#forge:nuggets/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json index 676a09dd2..bef116c77 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json index 4efa6bf96..ead2e68dd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/coldiron" + "items": "#forge:storage_blocks/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json index d58196524..b0c559846 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/coldiron" + "items": "#forge:gears/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json index 12b031b12..86ab0f396 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json index 7edf0db80..57ae83d38 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json index 9d5a6e554..7508a60d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json index beac652d4..9afbb0f52 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json index c46ad4d97..94f6bb1f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json index 523e56c86..4d8189eeb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json index 7de597286..097f76070 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/coldiron" + "items": "#forge:nuggets/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json index abcb4a166..3a8a14ef4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json index 2ffd87bbe..617ec8097 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/coldiron" + "items": "#forge:rods/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json index 5672c370e..fd75fd16f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json index 422e7f281..51ef48522 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json index 741a8e87e..c287a3aba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json index 598268428..bbee3fa7f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/coldiron" + "items": "#forge:tiny_dusts/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json index 4686762c9..86fe94e6d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_blasting.json index db8d4a830..c35d82bf4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/coldiron" + "items": "#forge:raw_materials/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_smelting.json index c0faa43e2..daed63bfe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/coldiron" + "items": "#forge:raw_materials/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json index 1450ac1c6..b394f5fad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json index f502c726a..e7ca2fccd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json index 6d876fa3e..97cf50738 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json index 62645e60d..3e0a91c5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json index daa2be469..0d4b42d54 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json index 57fe93861..f0fe0764d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/coldiron" + "items": "#forge:storage_blocks/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json index 6ebdc3a42..53336ae18 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/coldiron" + "items": "#forge:dusts/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json index b606fb757..989a1f404 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/coldiron" + "items": "#forge:storage_blocks/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json index ff3129bc5..a3b352ff9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json index 94ede39e9..ccf3ecc70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json index 0612eed36..0a6e290da 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/coldiron" + "items": "#forge:storage_blocks/coldiron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/coldiron" + "items": "#forge:ingots/coldiron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json index c2d043333..61f2eef00 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/copper" + "items": "#forge:nuggets/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json index eaba05e7d..00e25a046 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json index 9846d22da..cb169bc57 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json index aac58d1e3..7a9868afa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json index 5eb15fa53..7927c13f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json index 242f391ed..8e0d12046 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json index 6c38a88f1..17e4da107 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json index 113f6c0af..fe3bb8ce4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json index e8c97a3c3..709b1565d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json index 88d2b102e..1e72f5117 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/copper" + "items": "#forge:nuggets/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json index 50a51abd3..4edfa2022 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json index 7b300e28a..d4c9db815 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/copper" + "items": "#forge:storage_blocks/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json index 3d0211312..58f302737 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/copper" + "items": "#forge:gears/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json index c6f38dded..4a7dc9135 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json index 3d8e2d703..b94fe874a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json index b5e2bdf9c..f92d0b013 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json index 7b1ac7ef6..f740baec0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json index 4357138fa..103f78648 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json index dcfa11155..c29bb18d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json index e6ae6a9b1..247b2001a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json index 060ea837e..1738deff0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json index e282f2e9b..eb4b8e6b2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/copper" + "items": "#forge:rods/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json index 18928d559..b1275c512 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json index c3c71a39e..8a0ef8541 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json index 401ddca40..e25393988 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json index facf6fbc3..033fb0622 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/copper" + "items": "#forge:tiny_dusts/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json index cf9ba1f96..b0e11d9ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json index 8e805b005..955ee98f5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json index 336469cfe..128251e56 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json index c1d95bfef..a0b2249d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json index a98af403f..ae9c70f06 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json index 8efb7e309..d3657f294 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json index b118b4e91..1713e1846 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/copper" + "items": "#forge:storage_blocks/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json index 81fbfb209..275cf5677 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/copper" + "items": "#forge:dusts/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json index 6bce02ca0..b7116cd37 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/copper" + "items": "#forge:storage_blocks/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json index de9a895b7..d5d21b35b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json index ff5b0aa56..e94871064 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json index a1f2e78b7..3577c2346 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/copper" + "items": "#forge:storage_blocks/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": "#forge:ingots/copper" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json index 4a7f53bea..1cf712121 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/cupronickel" + "items": "#forge:nuggets/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json index 6454f2b6b..e2244eb67 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json index 7cabd07c7..aa077c485 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json index 683ff83a3..8b144e8b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json index e2d7485df..dad7a2667 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/copper" + "items": "#forge:dusts/copper" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/nickel" + "items": "#forge:dusts/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json index 637f204fe..a4ccdb52c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/cupronickel" + "items": "#forge:small_blends/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json index cca786221..97251c030 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json index a830cc958..fe9833b5e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/cupronickel" + "items": "#forge:storage_blocks/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json index 0f80344d6..80b23aafa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json index 16b0b3608..a4c957b38 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json index da6d1e74a..d504b865d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json index 1ff8f607a..08043f925 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/cupronickel" + "items": "#forge:nuggets/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json index 5d908b24e..698eee55f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json index 7e8a37d2c..fac1c109a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/cupronickel" + "items": "#forge:storage_blocks/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json index c63ba22ae..c664cf66d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/cupronickel" + "items": "#forge:gears/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json index 207c69228..605e7bdf7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json index 5ced4c914..5b4e9edef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json index 97ecfe708..b29d727d4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json index b260c2177..b545e9744 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json index 029061fd5..b7d20a391 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json index 1a523fb36..65572262b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json index 4d1ec3850..8ae0f5d00 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/cupronickel" + "items": "#forge:nuggets/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json index e9057555d..f741cd9f4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json index fedce5762..443c58880 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/cupronickel" + "items": "#forge:rods/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json index ae8468844..1dcc9e6c1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json index 792e814c4..31087c370 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json index 7c1be0d96..e36cfe30c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json index 14c7d9c60..3c7b5091d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/cupronickel" + "items": "#forge:tiny_dusts/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json index 349db98e6..9bb4d0d13 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json index 1d3a9911a..64cade092 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json index 2c2dab3e0..51916e828 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json index 1e70f4284..8d4d9062b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json index c68a088ab..cbfc5cc56 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json index 076c023a2..890ea71ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json index a1ef0e0fc..f0a5d83cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/cupronickel" + "items": "#forge:storage_blocks/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json index 61bb001e6..e9068ef45 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/cupronickel" + "items": "#forge:blends/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json index 213315303..dfb95d9fb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/cupronickel" + "items": "#forge:dusts/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json index 2794d7ed5..5f6487390 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/cupronickel" + "items": "#forge:storage_blocks/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json index 8a4bd8ae8..6c3ebd0b8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json index 21d2b6d29..fe1196204 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json index f46889689..c0f1722e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/cupronickel" + "items": "#forge:storage_blocks/cupronickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/cupronickel" + "items": "#forge:ingots/cupronickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json b/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json index 221af07a9..ad7189276 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json index 67ea7879e..350d79e96 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/diamond" + "items": "#forge:nuggets/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json index c657b8062..95ca13a3f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json index 4ecb64560..d41ef7fb4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json index ed470f9dd..f1d6ca887 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json index 0940d7ac8..b8973c0b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json index a86ca6870..1ef9c22ab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/diamond" + "items": "#forge:nuggets/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json index 6e95ad780..f5d25cd49 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/diamond" + "items": "#forge:storage_blocks/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json index 9b9ecd0d0..65704ac42 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/diamond" + "items": "#forge:gears/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json index 91577ad2d..14d605300 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json index 9c75550ce..8309ee119 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json index 9f3e052e9..49dda5dbe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json index f2631f820..7a0b93634 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/diamond" + "items": "#forge:rods/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json index 4ff00182d..c9108876a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/diamond" + "items": "#forge:tiny_dusts/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json index 53061a0a0..59072863c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json index 18c717647..d664afeb4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json index bcaf883f7..cba604714 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json index 554602863..b603a2df7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json index 88fe09937..efc4a85b1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json index cbfa6b0bd..49a17fe70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/diamond" + "items": "#forge:storage_blocks/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json index f72b37756..f51e9911c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/diamond" + "items": "#forge:dusts/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json index 5fab42acb..12850e07b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/diamond" + "items": "#forge:storage_blocks/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json index 72aefcea5..eaf2153c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json index ee7c8010a..f6c6e4c07 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/diamond" + "items": "#forge:storage_blocks/diamond" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/diamond" + "items": "#forge:gems/diamond" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json index 9a1a1d63e..be796d0ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/electrum" + "items": "#forge:nuggets/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json index 55042b08c..96f57e0dd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json index 6025e46a9..d43ea4d38 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json index 248195093..f6af9baaa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json index 09ce38a7a..21eb9d92f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/gold" + "items": "#forge:dusts/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/silver" + "items": "#forge:dusts/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json index 2f6795cc1..a060f22a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/electrum" + "items": "#forge:small_blends/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json index 619415a01..abeb83985 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json index 387a58207..05536ac79 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/electrum" + "items": "#forge:storage_blocks/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json index 5e5cf026f..6e8ff5f9d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json index 2b7e83953..ee0f45424 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json index 5384354db..35cbef580 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json index 8b6a3cb05..eff3edcfc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/electrum" + "items": "#forge:nuggets/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json index 5bb2382e8..7be1a532b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json index 740ffed62..09a102f36 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/electrum" + "items": "#forge:storage_blocks/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json index d83337047..b2698eb24 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/electrum" + "items": "#forge:gears/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json index afac7727d..7d72abaa2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json index 0eb2b00ab..526d39638 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json index 3084361ed..471b949a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json index 6e34d6631..73d29ee47 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json index 46650f148..773a3f096 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json index db9b176e9..0c9441e59 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json index 3faed8658..1093c86af 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/electrum" + "items": "#forge:nuggets/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json index 2331e65b6..8a3b58192 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json index f117727bf..fecfe75c4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/electrum" + "items": "#forge:rods/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json index 8eaa53944..7510c6460 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json index f4ada02d6..45329f328 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json index 3cfc10c16..278f0a976 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json index 2e0ad2a8e..c98aba3b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/electrum" + "items": "#forge:tiny_dusts/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json index d07e9cd47..229767732 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json index 4246e26e8..96973f032 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json index f1fdd2726..154c8a6f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json index ea4ec620d..8abaf046b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json index f4be53fea..975c569ef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json index 20a96e93c..cf502b805 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json index 5bce62ae1..91179c634 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/electrum" + "items": "#forge:storage_blocks/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json index f503d5d25..0179d3db5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/electrum" + "items": "#forge:blends/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json index 05f77cce6..e3e60792c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/electrum" + "items": "#forge:dusts/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json index 4ea3f1c9a..902ed3cec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/electrum" + "items": "#forge:storage_blocks/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json index d41478a44..3c670715a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json index b41be69ad..1b30c7bb4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json index 3367b4793..9836f0e53 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/electrum" + "items": "#forge:storage_blocks/electrum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/electrum" + "items": "#forge:ingots/electrum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json index 183384252..ac9828225 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/emerald" + "items": "#forge:nuggets/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json index 12e44d2e8..6cb541aee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json index df4442891..cc96ab864 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json index 2f46a8af6..78ab99328 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json index eb781de29..36328fd2a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json index 3bf5c6962..f175502a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json index 5855b8720..d42385dd7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json index c4176df13..462a54291 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/emerald" + "items": "#forge:nuggets/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json index 8673e343a..30623c696 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json index dcceb8d8d..d03de9480 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/emerald" + "items": "#forge:storage_blocks/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json index 39f0783e6..85c7daa35 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/emerald" + "items": "#forge:gears/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json index dafe1df05..4bb365321 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json index 81e08ff7f..a6c2008a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json index 95246fc21..1882bbd1e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json index c867fd30f..40d378e12 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json index 3af9ffef5..20c1d4cc7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json index 9ff210a25..760be4c40 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json index c67592e2d..bba46a8ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json index 2aa2a7521..d0abdab46 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/emerald" + "items": "#forge:rods/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json index bd80be655..8cd9e97d0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json index fd2fb69ec..260656178 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/emerald" + "items": "#forge:tiny_dusts/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json index 0f19dc88b..39b7c4d39 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json index 63617d917..607b50cb0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json index ec0077ecd..9c6882955 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json index 8f39635bd..bed9d8109 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json index 29606c623..c2ec964b8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json index 1ed80a32d..190b6edef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json index 826a3f227..c16126c90 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/emerald" + "items": "#forge:storage_blocks/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json index d7c0db12d..c4a5ef08c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/emerald" + "items": "#forge:dusts/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json index 6a3c3a659..eb144c5f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/emerald" + "items": "#forge:storage_blocks/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json index cbffab5df..84def1c25 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json index 99254497d..89829edf5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json index e3288a7a1..376ac995d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/emerald" + "items": "#forge:storage_blocks/emerald" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/emerald" + "items": "#forge:gems/emerald" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json b/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json index dcb6b3a59..55ee929ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json index c7ad2a457..e239180c6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/gold" + "items": "#forge:nuggets/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json index a0f0ca710..93d448b8f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json index 83e34adc3..4e373867a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json index a39753e73..d86a01ecf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json index bbe9c21de..390a13e42 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json index 91ec079c4..4185119c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/gold" + "items": "#forge:nuggets/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json index 60c5ba1f1..52f7971f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/gold" + "items": "#forge:storage_blocks/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json index 896531dc1..dddb11de5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/gold" + "items": "#forge:gears/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json index 684c4ffdd..4e2f91c3d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json index a93f5ef26..41af550ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json index adb3d52c3..763017b85 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json index 072b2c6fb..b78257964 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/gold" + "items": "#forge:rods/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json index 719d17a27..d094309be 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json index 26289b7b1..13636cfb9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/gold" + "items": "#forge:tiny_dusts/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json index f8153ccfd..f6ee54edf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json index 4ca56046f..9149abc4e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json index dbd879240..4333905af 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json index 78f466d2b..a2982ebcc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json index d757bdb13..722a16549 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/gold" + "items": "#forge:storage_blocks/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json index 0a3e93f47..2deecf694 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/gold" + "items": "#forge:dusts/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json index eedde5a1d..762ea233a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/gold" + "items": "#forge:storage_blocks/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json index f65ad4a3d..ea9619345 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json index 5e3de4425..fe579d58e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/gold" + "items": "#forge:storage_blocks/gold" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/gold" + "items": "#forge:ingots/gold" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json b/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json index 52c9af0bf..1ca4737b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears" + "items": "#forge:gears" } ] }, @@ -27,7 +27,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json index 51891a4ca..631853546 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/invar" + "items": "#forge:nuggets/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json index 3c7f44dfb..c0a93b4b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json index edf01dbd5..ef07c20fb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json index ac777b601..40ffec657 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json index e3a40ea39..a2df1c90f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/iron" + "items": "#forge:dusts/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/nickel" + "items": "#forge:dusts/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json index d7ad059df..bc7c1f17f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/invar" + "items": "#forge:small_blends/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json index 8ae3fcb5c..09e1e29bb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json index 51cd2ee11..6afc98deb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/invar" + "items": "#forge:storage_blocks/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json index 2962c31ab..001c8190a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json index 28b6d954d..1286968c0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json index 375611a1e..2cdffcf19 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json index 148075f78..f947ee5f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/invar" + "items": "#forge:nuggets/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json index 01ab7d4f6..5a128a18c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json index b83c6e927..5e0648038 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/invar" + "items": "#forge:storage_blocks/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json index 3be5351e2..3096f86db 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/invar" + "items": "#forge:gears/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json index 8975fb079..0f77abda9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json index f044787a3..8a68f70fc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json index 203c7c26f..5a6a3bfc8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json index a86c04079..d06091f1f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json index f86edb206..1cbd99baf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json index 8640d5e9e..51b3fea7b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json index 4444cfb95..5aba5235c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/invar" + "items": "#forge:nuggets/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json index 5e89fe72c..cd589f3d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json index af5cd4b8d..b41ed7806 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/invar" + "items": "#forge:rods/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json index 2bbdb9fe0..017106ef0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json index d7df00886..d6f58aa1f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json index 85bfeb9ab..a267cda96 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json index 18adec874..3edc84a58 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/invar" + "items": "#forge:tiny_dusts/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json index 5ec059bcc..aca914317 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json index 7b96887b3..678b32f59 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json index f5eeddfb2..e78087622 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json index 84a31caf0..58833a902 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json index 86677b224..b67d0ef28 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json index b3ab78388..48b749e4f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json index 8c81ba1f8..8790bbe0c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/invar" + "items": "#forge:storage_blocks/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json index 932eaa46e..4ea5378be 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/invar" + "items": "#forge:blends/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json index 7ac526d87..fb4742da0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/invar" + "items": "#forge:dusts/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json index 7d399c1ff..7e7e599f7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/invar" + "items": "#forge:storage_blocks/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json index 80ff9f78b..7d9232007 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json index 6702713eb..b542ef49a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json index 2e023506d..970f10aeb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/invar" + "items": "#forge:storage_blocks/invar" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/invar" + "items": "#forge:ingots/invar" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json index dae28ec19..8e80142a9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/iron" + "items": "#forge:nuggets/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json index 12c134e39..9a5d490b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json index bf5d235b5..bd04bf495 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json index 3ed9515f0..ec80ba57c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json index 057c9eb4b..2b6615d73 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/iron" + "items": "#forge:nuggets/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json index a0e91842d..013eca782 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/iron" + "items": "#forge:storage_blocks/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json index a3ba330e4..6e2bc78e2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/iron" + "items": "#forge:gears/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json index b78b214a2..b67fce7af 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json index a3bf7ef62..5c4ad6b30 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json index 66e6878c9..23675181e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/iron" + "items": "#forge:rods/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json index b0c64ceb6..05fd382fd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json index e232735ee..cd7ace272 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/iron" + "items": "#forge:tiny_dusts/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json index 7ded6f374..d15722744 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json index c94343812..1f9141ed2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json index 67688b2cb..8c4c9678b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json index 75ee8c766..e10047138 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/iron" + "items": "#forge:storage_blocks/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json index 27e1f052c..00e9dd8e3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/iron" + "items": "#forge:dusts/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json index 6b13b3744..3781a6c76 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/iron" + "items": "#forge:storage_blocks/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json index 2c690a6de..06f66be98 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/iron" + "items": "#forge:storage_blocks/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/iron" + "items": "#forge:ingots/iron" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json index c17dbfc53..6ef40916f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/lead" + "items": "#forge:nuggets/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json index 05641442d..001345120 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json index eb75269ef..7701791aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json index 798fa61e8..12b28faec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json index aa35652b8..5770fd653 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json index 86a6b35f3..5d2e7cd8d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/lead" + "items": "#forge:storage_blocks/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json index be6c96372..f3caa0c6c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json index 9a1d35da7..f3f11d0c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json index cbddfaa91..b2a52f23a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json index 8b34d4434..25b1527fe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/lead" + "items": "#forge:nuggets/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json index 3cec2b5ac..e01675a89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json index bfc95635e..f0b1cf1a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/lead" + "items": "#forge:storage_blocks/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json index c4a5fad86..69844f961 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/lead" + "items": "#forge:gears/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json index ebc2e30e6..7c13d1a61 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json index b9f9c6621..de637dc78 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json index 24c6af3e1..b6772db3e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json index c8be1c7e5..ae051e0f1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json index 2d701ce9d..83b8ffd60 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json index 068bf4c85..8c0b2aa89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json index 66496ebd3..ffdbbe68b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/lead" + "items": "#forge:nuggets/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json index 8dafe230d..05aa587a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json index 914d084a6..02e5aae0c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/lead" + "items": "#forge:rods/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json index c2bda37a7..cb34107a1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json index 7a133dd78..18995e403 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json index eb99599df..2f2db6235 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json index 8c38622fe..1b396b7aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/lead" + "items": "#forge:tiny_dusts/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json index 1acecbfa3..d3daac93c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_blasting.json index d8a8a1427..5ecb37d5a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/lead" + "items": "#forge:raw_materials/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_smelting.json index 35e3dde7a..2dd9d7150 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/lead" + "items": "#forge:raw_materials/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json index 8aea0960d..61c69b2e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json index 8cee8eb68..ce37a3039 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json index 8e8c43310..c3886e8f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json index 8c9f06f66..b3dbb6cb8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json index 11f4d5b2c..66c655354 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json index 00b76aa40..7a9406c7d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/lead" + "items": "#forge:storage_blocks/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json index c6cd5e985..1b269db83 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/lead" + "items": "#forge:dusts/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json index 9ead7d5f3..e83ed9be5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/lead" + "items": "#forge:storage_blocks/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json index 1c9d9f778..d6166942f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json index 0a0a8c990..e77bc2ad2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json index 108a03e6b..2df5f1699 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/lead" + "items": "#forge:storage_blocks/lead" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/lead" + "items": "#forge:ingots/lead" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json index 9d342dabe..d9b2baf6e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/mercury" + "items": "#forge:nuggets/mercury" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mercury" + "items": "#forge:ingots/mercury" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json index 419424961..3375fc88c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mercury" + "items": "#forge:ingots/mercury" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mercury" + "items": "#forge:ingots/mercury" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json index a195c50ef..b0d0bb85c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/mercury" + "items": "#forge:tiny_dusts/mercury" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mercury" + "items": "#forge:ingots/mercury" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_blasting.json index c4bbed8af..7ba78babe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/mercury" + "items": "#forge:raw_materials/mercury" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_smelting.json index a8113cb47..07d90bd66 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/mercury" + "items": "#forge:raw_materials/mercury" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json index 28536aade..6bed188cd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/mercury" + "items": "#forge:dusts/mercury" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mercury" + "items": "#forge:ingots/mercury" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/minecart.json b/src/generated/resources/data/basemetals/advancements/recipes/minecart.json index f0440eff6..36d192d88 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/minecart.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/minecart.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json index e19a91e98..e63adb2aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/mithril" + "items": "#forge:nuggets/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json index fed204ec7..9b9a7220d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json index 73868de49..5315f3947 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json index 790ac3c3f..b062bfe19 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json index 622d90c01..ccecc9ea4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/silver" + "items": "#forge:dusts/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/coldiron" + "items": "#forge:dusts/coldiron" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mercury" + "items": "#forge:ingots/mercury" } ] }, @@ -35,7 +35,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json index f6217b814..cb0ba7ccf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/mithril" + "items": "#forge:small_blends/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json index 8c8fbe3a6..83b58c326 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json index af0190348..2fb4bd629 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/mithril" + "items": "#forge:storage_blocks/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json index c6022dade..d0d30631e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json index a834bf595..761486f29 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json index dfad75a2e..a14dc3603 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json index c756d2190..02387b284 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/mithril" + "items": "#forge:nuggets/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json index ad4caf806..8ca0794a6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json index 556b14346..7c87d5ee2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/mithril" + "items": "#forge:storage_blocks/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json index c2410dd9e..c386fa12d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/mithril" + "items": "#forge:gears/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json index 9a7c92ebf..435edfa55 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json index fba8c4daf..73e0f1016 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json index 1459d677e..b5e935b38 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json index fd1a9ac51..45070a1a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json index fd17d5b8e..cdf85af1d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json index 304ae1634..9c43ffc0a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json index c1d99579c..c29119c5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/mithril" + "items": "#forge:nuggets/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json index c92a5ad62..5a3897040 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json index d0cd00a3a..ca4b0e6a6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/mithril" + "items": "#forge:rods/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json index b9d6f3784..27df7585c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json index 61a2812cb..ab857274c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json index 8cb196a7e..b91c70863 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json index f22b9012c..d9c506dac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/mithril" + "items": "#forge:tiny_dusts/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json index a996e7c92..a49524cff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json index 52b3f95a6..c73f9f0d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json index 0dde7a807..a40f919b6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json index b0b9208d3..0378f2dd7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json index bc9e6f199..6c05d8663 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json index 213d898c7..d86a870f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json index fea260858..2412f0d66 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/mithril" + "items": "#forge:storage_blocks/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json index 4037c31f2..ad6bf2fbc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/mithril" + "items": "#forge:blends/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json index 3cb2d1476..cc5cd0986 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/mithril" + "items": "#forge:dusts/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json index adcc0eab9..5a544ab59 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/mithril" + "items": "#forge:storage_blocks/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json index 3835bb25b..6a2e2ee80 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json index 390908208..760fe188c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json index 3626e2c72..1646c0f72 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/mithril" + "items": "#forge:storage_blocks/mithril" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/mithril" + "items": "#forge:ingots/mithril" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json index 286dce812..5ac937fbc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/nickel" + "items": "#forge:nuggets/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json index af9e6992c..dd5497c53 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json index 0df238a13..444314ff7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json index 7c849be4f..b3881b183 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json index 94c464065..dfe764d09 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json index dc6a94e4b..3da8a7806 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/nickel" + "items": "#forge:storage_blocks/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json index aa5efb8fa..941c3e8fc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json index a389b77c8..4bc5073a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json index 066ad6110..846641ea7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json index cac7db8e1..7302c221b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/nickel" + "items": "#forge:nuggets/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json index bbe050694..854d331c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json index b0ec42c3a..20d5e7a74 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/nickel" + "items": "#forge:storage_blocks/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json index be91d2dea..e098d2380 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/nickel" + "items": "#forge:gears/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json index 2c2674062..6e21dddfa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json index 4da4c4094..fe54697ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json index 79ade4a7a..011734818 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json index 7e4544723..735693719 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json index 17fff7484..ed7f06b58 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json index 178acf7d1..bce02b973 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json index 06009ec3c..eeac1f063 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/nickel" + "items": "#forge:nuggets/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json index 7e66ac122..db9b8f089 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json index d9a23b56c..cf1b75cd8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/nickel" + "items": "#forge:rods/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json index c5bb24796..195939fbe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json index 3737ca220..5282a461c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json index fde106a6f..5e31c2427 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json index 972b8db25..21a7d694f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/nickel" + "items": "#forge:tiny_dusts/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json index c69c75a8e..f29508e78 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_blasting.json index 68b501fd8..a05813c87 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/nickel" + "items": "#forge:raw_materials/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_smelting.json index d5f855ee8..eeec0afd9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/nickel" + "items": "#forge:raw_materials/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json index f31b48d8e..608c1f0c4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json index 5210daa76..8e31b58cc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json index 692c628c9..8c8218017 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json index 149450805..b9db2bcfe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json index 60c1cae7e..1578636d0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json index 8c6d3feb2..8945b4cc5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/nickel" + "items": "#forge:storage_blocks/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json index 70eea448a..0979a0f62 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/nickel" + "items": "#forge:dusts/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json index 78972773c..c77578ef5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/nickel" + "items": "#forge:storage_blocks/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json index c900bb357..77b9cb4a7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json index 805da3a05..33f510d19 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json index f0ac400ca..20c832299 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/nickel" + "items": "#forge:storage_blocks/nickel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/nickel" + "items": "#forge:ingots/nickel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json index 3d0ae2b0c..f9c542e04 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/obsidian" + "items": "#forge:nuggets/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json index da4133f51..06fecfa39 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json index 056dceca3..880d6c572 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json index e04f98667..a71bef582 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json index 8d30f5fd7..9f81a7483 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json index 83f4fdfdb..8e6cf22a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json index 6499175d9..fc858312e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json index 949422025..28918e8fd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json index 3b8add309..82625e8f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/obsidian" + "items": "#forge:nuggets/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json index 57c534964..218f2192a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json index cd685f76f..7a691b639 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/obsidian" + "items": "#forge:storage_blocks/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json index f73499f73..aaa566f5c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/obsidian" + "items": "#forge:gears/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json index 80c773aa7..ede6521a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json index b2027ff42..90a7cde13 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json index fc22c841c..aa28fe615 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json index 0f48515cd..70ae85a7a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json index a1bee9b6d..9356a4027 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json index 120d1a13c..de729a9d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json index 2eb6f0f7a..f20122bc1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/obsidian" + "items": "#forge:nuggets/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json index 87ce0d39f..10a115c39 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json index 8b5ba8e37..f57d69a13 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/obsidian" + "items": "#forge:rods/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json index 9f8c60b6d..8eb7db401 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json index 4fcd68145..38b99955e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json index 51d25fe8e..7a2a0e5ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/obsidian" + "items": "#forge:tiny_dusts/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json index 0cf93937c..1b6628bd7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json index 4774bbd02..4df7f5343 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json index 7fd068885..1fe91582b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/obsidian" + "items": "#forge:storage_blocks/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json index f1b98516a..89d1115c0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json index f52f79531..01a0f2dd7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json index 01bc5df9a..cd005c759 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json index 08c7999d9..57d0d23b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/obsidian" + "items": "#forge:storage_blocks/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json index 1769c5af9..b0ed04adb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/obsidian" + "items": "#forge:dusts/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json index 534c37858..e68f7634c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/obsidian" + "items": "#forge:storage_blocks/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json index 09b9df2b9..11bcd0e7b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json index ea2735d2a..1d408cd2d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json index 085959a1e..5956e84bd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/obsidian" + "items": "#forge:storage_blocks/obsidian" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/obsidian" + "items": "#forge:ingots/obsidian" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json index 819f75de8..c9aed75ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/pewter" + "items": "#forge:nuggets/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json index 7a32a511a..e72214cd8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json index cbc52d9ef..c50cc5461 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json index 4d315c477..238cce055 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json index 77f7157d2..0fa6d69f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/tin" + "items": "#forge:dusts/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/copper" + "items": "#forge:dusts/copper" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/lead" + "items": "#forge:dusts/lead" } ] }, @@ -35,7 +35,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json index cf6af8c88..61c3b95f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/pewter" + "items": "#forge:small_blends/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json index 2c17bbf8d..899edc686 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json index 82f8bb58b..b4a8d46e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/pewter" + "items": "#forge:storage_blocks/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json index e2e444c1a..307ce21ef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json index 2668bd899..dc1420eed 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json index 4c173b345..3f012dfcd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json index caf02b9ae..841757bb2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/pewter" + "items": "#forge:nuggets/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json index de11e06a8..859b481ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json index d17cbc27f..f8e803a90 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/pewter" + "items": "#forge:storage_blocks/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json index 87579afb9..916888c82 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/pewter" + "items": "#forge:gears/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json index ed0f75e73..237c87a69 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json index 7bad3f335..7b25987fb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json index d6a650e4c..6fb2d6a31 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json index b5ee22410..ffd457955 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json index 527f48b10..76d841d3a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json index 1cc4ee751..e484e7e0e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json index 3c788bec6..a6ab71083 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/pewter" + "items": "#forge:nuggets/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json index ac036141e..25b71a00b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json index 8a43e956e..9c9e1e164 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/pewter" + "items": "#forge:rods/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json index 8e07963ca..3abe992f5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json index 552b9023d..5ad478de9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json index 06de9a2b9..9aeb255a9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json index dfcb8034c..6108541f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/pewter" + "items": "#forge:tiny_dusts/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json index c0cd48383..fdc8cba47 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json index 6990ee2e6..e8c42c02f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json index 9748b69c3..03c21325c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json index 84b4925e7..c345969c6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json index ed66fe305..6a11593b2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json index d0e31c8e9..0514c1dbb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json index 144843f01..2414ad5b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/pewter" + "items": "#forge:storage_blocks/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json index 5afef330d..c3ea4d144 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/pewter" + "items": "#forge:blends/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json index 17b6d03ea..91b90467b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/pewter" + "items": "#forge:dusts/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json index 9d02ebc79..d77652a42 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/pewter" + "items": "#forge:storage_blocks/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json index 64d8de7d9..92c4936ec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json index ab59f4019..ceaf76152 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json index c285b7bac..a69da69dc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/pewter" + "items": "#forge:storage_blocks/pewter" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/pewter" + "items": "#forge:ingots/pewter" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/piston.json b/src/generated/resources/data/basemetals/advancements/recipes/piston.json index 67f8231fa..6060929ab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/piston.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/piston.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:cobblestone" + "items": "#forge:cobblestone" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/redstone" + "items": "#forge:dusts/redstone" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -35,7 +35,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -45,7 +45,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json index d2e46afcc..d3aba485d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/platinum" + "items": "#forge:nuggets/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json index 2e6f4113e..b9a04590d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json index 95173c6d3..23199f30b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json index 68e5711ea..b9bf3b973 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json index 522d4c6f6..d595f6ee3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json index 60dd561de..6899bb196 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/platinum" + "items": "#forge:storage_blocks/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json index 6b8935229..f618353f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json index 5aa010640..e7236dc7b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json index 9900e3dd3..18985f7e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json index 446206b93..686c113ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/platinum" + "items": "#forge:nuggets/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json index 20c434122..2215dfd01 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json index 47992e8b5..0ff412c3f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/platinum" + "items": "#forge:storage_blocks/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json index e03d0d6dc..81444aab8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/platinum" + "items": "#forge:gears/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json index fa26f35eb..39ad564db 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json index e25f64b83..b6f1de39b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json index 484e2e5bc..8dd6b0fbc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json index 5cc29f8dd..e972b14cf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json index 2734b1c20..efd039704 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json index 869981398..b4065fe97 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json index 2f52b1b02..c46e771df 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/platinum" + "items": "#forge:nuggets/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json index 726167109..a75277a45 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json index 70bdb8568..702160b80 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/platinum" + "items": "#forge:rods/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json index 1f4f3eed6..cea7e8e32 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json index 05e296fae..bc69255b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json index 360fd088a..7cb52c4d7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json index b83d52f7f..4b864dfb8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/platinum" + "items": "#forge:tiny_dusts/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json index 928090d6a..0b7917ed0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_blasting.json index 0b59b897e..d9d68b472 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/platinum" + "items": "#forge:raw_materials/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_smelting.json index 4f3994c90..1b49e5413 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/platinum" + "items": "#forge:raw_materials/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json index 103e6d5a3..824982ee4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json index 82bb7c05d..86c3afae1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json index 8d7addd13..ff0dd7e5a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json index f1ea50446..35db6c851 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json index f02b697c6..a47107ad3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json index 5f94ddcd5..2f1c22b8f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/platinum" + "items": "#forge:storage_blocks/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json index 0dff30d37..a8a7acd99 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/platinum" + "items": "#forge:dusts/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json index d445a5e7a..d26f08742 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/platinum" + "items": "#forge:storage_blocks/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json index d0478f6bb..11891283e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json index 26f480642..c76f9f674 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json index ae1593568..36f4dfc79 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/platinum" + "items": "#forge:storage_blocks/platinum" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/platinum" + "items": "#forge:ingots/platinum" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json index 6d58e2c98..85ca9dffa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/quartz" + "items": "#forge:nuggets/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json index ca2de8293..d3343bf21 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json index 9f641826a..ad3f4c533 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json index 606a9354e..c03193aff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json index e28b4cb04..c7efa10db 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json index 1c7a89784..fda4581d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json index 0a000d720..4d6f8c069 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json index fd004825d..914ee84b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/quartz" + "items": "#forge:nuggets/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json index 9f0c1397f..2473f65a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json index 48cc7fabe..37f27b10c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/quartz" + "items": "#forge:storage_blocks/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json index 8fc621396..a91c14018 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/quartz" + "items": "#forge:gears/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json index b6638590c..e89b08125 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json index 244a5a336..7dd93c948 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json index ce2193ecb..c5aa3656a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json index f2ce45950..fd6db9ad3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json index bf7650f7f..332d4efb9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json index c7904c1e1..8b4c796f7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json index ee77339b1..545c12e5a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/quartz" + "items": "#forge:nuggets/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json index 345f4fb90..ba782189c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json index f06d9f788..c8404a07a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/quartz" + "items": "#forge:rods/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json index 3967a9a72..bdac41d5c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json index cd2d6ea1e..c65a432e2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json index 556156a84..76107dc75 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/quartz" + "items": "#forge:tiny_dusts/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json index 85963a37f..0b20c9844 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json index 1e0307df4..e7bbae20d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json index b0e106bae..777e1836b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json index 49544b65a..23cf84fc8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json index efd9a057d..4670ebd8f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json index ecf97d3db..89e116ecc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json index 77d0982af..0fc395d9a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/quartz" + "items": "#forge:dusts/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json index c6f863003..646611880 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json index 78474aa9e..d69f2e9eb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json index 631e93531..af8ed0a1d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/quartz" + "items": "#forge:storage_blocks/quartz" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:gems/quartz" + "items": "#forge:gems/quartz" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/rail.json b/src/generated/resources/data/basemetals/advancements/recipes/rail.json index 868960274..349ac8174 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/rail.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/rail.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json index b9e4090cf..ee6c5eec5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/redstone" + "items": "#forge:tiny_dusts/redstone" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/redstone" + "items": "#forge:dusts/redstone" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json index ccaca79b0..e1f875c46 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/redstone" + "items": "#forge:dusts/redstone" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/redstone" + "items": "#forge:dusts/redstone" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json index 0bfa8c857..ef57837a5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/silver" + "items": "#forge:nuggets/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json index 141912b0f..8e768cba4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json index bbee8fc0f..1fe188cb7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json index 9ea9531ae..01cca19e5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json index 810f6feaf..98fa45002 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json index ff81cb6b8..7f87b1f30 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/silver" + "items": "#forge:storage_blocks/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json index 2e433970a..26d3d1974 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json index 1a04ba188..c82784096 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json index 5045dd330..ed28bb9b1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json index a92b664bd..bfb2cfff5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/silver" + "items": "#forge:nuggets/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json index 8c215bf2b..f56abe31f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json index 6f933a4e4..70f221c40 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/silver" + "items": "#forge:storage_blocks/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json index 0a5f42688..43589ba8d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/silver" + "items": "#forge:gears/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json index 0b8a51315..783abdf8c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json index a83f78b00..7598d5f03 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json index b618804e7..a03c01cbe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json index 54e49cfe1..3f0094cba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json index 5313d160b..44b4fc34a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json index b23d3abc0..8d487cf3e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json index c63e57016..3c91a357d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/silver" + "items": "#forge:nuggets/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json index ffae86574..9db0b1661 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json index 18b83affe..40d141c33 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/silver" + "items": "#forge:rods/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json index c4d0d91eb..6781c1cf7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json index 7503e8ee8..fe8a4ad1a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json index 907b71856..3308bed25 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json index 1989a9099..e84299892 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/silver" + "items": "#forge:tiny_dusts/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json index 41d635e11..438bdb707 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_blasting.json index 2387e2b75..1b0741907 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/silver" + "items": "#forge:raw_materials/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_smelting.json index 8e8c162ae..95cecdfad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/silver" + "items": "#forge:raw_materials/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json index a9bd56e5f..40d243395 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json index c53dc5da3..430821abc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json index a3cab841c..4ff68b9dc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json index 04fdc788f..f7bc23f22 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json index 9675ccc8b..b841a9eea 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json index 256f07227..b281c6ac2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/silver" + "items": "#forge:storage_blocks/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json index f1ef22398..7244081b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/silver" + "items": "#forge:dusts/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json index dba11b946..2beba4921 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/silver" + "items": "#forge:storage_blocks/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json index 0d0b22ff6..a458c967c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json index d54163192..323e70b99 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json index dcdff5e3f..a7329091b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/silver" + "items": "#forge:storage_blocks/silver" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "items": "#forge:ingots/silver" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json index 53163c8a2..45e45f2d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/starsteel" + "items": "#forge:nuggets/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json index c8e76d08f..8654129fc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json index 394f09513..900acfc8e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json index 90cadea72..bd6f1694c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json index 847c60c88..65f0a255e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json index 5aedc0498..a082728d5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/starsteel" + "items": "#forge:storage_blocks/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json index f441ef5ca..ecdd58e6d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json index e48cfa46b..46aa8327b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json index 685ee531e..53371c628 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json index 72f348f17..c803b5823 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/starsteel" + "items": "#forge:nuggets/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json index 9193ab4d3..a38d1bde5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json index d8f2c6434..357a6f58d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/starsteel" + "items": "#forge:storage_blocks/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json index b826d0182..36a3ba569 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/starsteel" + "items": "#forge:gears/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json index c373ca004..100fd612a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json index 26c03d0ee..db48089cc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json index 06b0e4558..2b2204d68 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json index e26ae2eb7..5375c8f9d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json index c2b21be4d..e6703f729 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json index bed70f65e..8396c0c72 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json index 651c718e1..4963be0eb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/starsteel" + "items": "#forge:nuggets/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json index 3b43c941c..ff6bbe1ae 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json index fe6ccd7ae..0e1282758 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/starsteel" + "items": "#forge:rods/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json index 21b90bf71..0fadb2229 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json index 26aafd68d..8c4b96db7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json index 2ab356b4b..52762c590 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json index 968a65beb..21d06eddf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/starsteel" + "items": "#forge:tiny_dusts/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json index 67b1c8848..7af624ea4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_blasting.json index 8569d0a43..b21463ffb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/starsteel" + "items": "#forge:raw_materials/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_smelting.json index 5aadc6840..b59925a78 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/starsteel" + "items": "#forge:raw_materials/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json index 3149333c1..dde1f3953 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json index e7d084a8a..25c312d92 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json index 219ee613c..9c655b4f0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json index dd6897177..5b36f08a8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json index 884ac7061..a7baee8c3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json index 0407a0f2c..9cf7e793c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/starsteel" + "items": "#forge:storage_blocks/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json index ca36ebafa..5e637ae45 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/starsteel" + "items": "#forge:dusts/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json index fce8886b0..aae5aa3b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/starsteel" + "items": "#forge:storage_blocks/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json index e57b90868..1bb25f9ec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json index daf74ab79..45ef58da8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json index 5bcce8afe..04ffc04ea 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/starsteel" + "items": "#forge:storage_blocks/starsteel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/starsteel" + "items": "#forge:ingots/starsteel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json index 7e997382a..dc6b10a30 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/steel" + "items": "#forge:storage_blocks/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json index f8155b14b..c2d696ddf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/steel" + "items": "#forge:nuggets/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json index 9dfd94777..abd7bce58 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json index 8eb80802b..eb2077bff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json index 3fe1a28d9..f60bbc85e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json index e1392c68e..57172635c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/iron" + "items": "#forge:dusts/iron" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/coal" + "items": "#forge:dusts/coal" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json index a45bc208b..261149648 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:small_blends/steel" + "items": "#forge:small_blends/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json index b496d4fcc..34bccdc2d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json index 27827fc0c..e7b05a358 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/steel" + "items": "#forge:storage_blocks/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json index e94d3abcc..250d7df2a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json index d5c347f81..ec93f3853 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json index 836a87c84..01dfeec57 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json index e61d95601..bb20781ba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/steel" + "items": "#forge:nuggets/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json index a4568fed1..4ee572e0d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json index 684c98940..d7c0a3b0c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/steel" + "items": "#forge:storage_blocks/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json index adc8c3e44..1a2475645 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/steel" + "items": "#forge:gears/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json index aea3ce484..58f035335 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json index af5d2345f..90fcadce5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json index 9fc3c4af3..3d45e3f33 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json index 507b0efb2..2d76032cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json index 4edfa808c..46f34b63a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json index 45bc08386..913f2025f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json index 3812ae813..ccd4c806b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/steel" + "items": "#forge:nuggets/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json index 7f31acf9a..b47cbcf6c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json index b00a7e587..cbbbbf7d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/steel" + "items": "#forge:rods/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json index f5f27613c..f56d0152e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json index 904ed6afe..f4e48a612 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json index c59bfcc45..44b30c7cd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json index 6e3592adf..04cbab7ce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/steel" + "items": "#forge:tiny_dusts/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json index 75704bbab..655cea05d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json index 844228482..1b4f5de7a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json index acba3d4d9..fb4a8a711 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json index 4190052eb..d02cb0770 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json index 846fb0aa5..6ccdf2ce7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json index 076d6bb76..9c536ead7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json index c436af3dd..b2bebe744 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/steel" + "items": "#forge:storage_blocks/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json index c4a3c9c66..2a3ad1617 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:blends/steel" + "items": "#forge:blends/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json index f8d3553cc..ba04b3f17 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/steel" + "items": "#forge:dusts/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json index 064211198..10212bb1a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/steel" + "items": "#forge:storage_blocks/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json index 232f5a669..8095b9bd5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json index 25b0cc406..cc3f5129e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json index 0205706bd..1c2b9dc24 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/steel" + "items": "#forge:storage_blocks/steel" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json b/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json index 04464e054..36b07a877 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:stone" + "items": "#forge:stone" } ] }, @@ -39,7 +39,7 @@ "conditions": { "items": [ { - "tag": "forge:stone" + "items": "#forge:stone" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json index d00f1d66e..6e24682c1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "forge:stone" + "items": "#forge:stone" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json index b23885c63..886daca60 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:stone" + "items": "#forge:stone" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:stone" + "items": "#forge:stone" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json index a68cff25e..a274b645f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/tin" + "items": "#forge:nuggets/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json index b3e06a80f..f97a26d23 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json index 0383bab00..04f235c26 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json index 7708ae3e0..127151619 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json index 9ef1e0a7c..86450553c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json index 6733e7d89..c2f9f1556 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/tin" + "items": "#forge:storage_blocks/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json index f735fe7e1..5b20681d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json index c9be975a6..a415f1b49 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json index 38c3c3fee..3bae90f6a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json index 4028e5379..a7ed1786c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/tin" + "items": "#forge:nuggets/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json index 3f6f4c723..f0545fe6b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json index 78cfab486..e3286824e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/tin" + "items": "#forge:storage_blocks/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json index 2bbfeef91..122bf302d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/tin" + "items": "#forge:gears/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json index a9b37a741..01f91987a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json index da4783dbd..316d6a21a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json index ae5137cc3..9559b8933 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json index b225478c9..c19a8da28 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json index 2cda7a1ab..dd6579da0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json index 05a9e4edd..48d7f0dec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json index 7931456c4..454426789 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/tin" + "items": "#forge:nuggets/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json index 15312e94b..c8b376697 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json index a2c040c16..b88b344d8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/tin" + "items": "#forge:rods/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json index 31c607d36..5d4bd31e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json index a58ee9022..2cf1c9a73 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json index 8541fca36..e8669d2e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json index 34af3591a..5b9912aa8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/tin" + "items": "#forge:tiny_dusts/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json index 9d7d00a23..3832a1b70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_blasting.json index da9408d1d..3a51df765 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/tin" + "items": "#forge:raw_materials/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_smelting.json index 527a21040..2a2ca80a3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/tin" + "items": "#forge:raw_materials/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json index 4fd7efaba..0d258024e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json index 0b0d67e39..13b40a0c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json index 83823e098..6fb743684 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json index 8e4c0279f..825a04587 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json index d86244c08..7dd106d31 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json index ac2b55a70..6695d0359 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/tin" + "items": "#forge:storage_blocks/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json index d77c227c7..611e45e77 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/tin" + "items": "#forge:dusts/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json index e0a43af3e..cb4e9597e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/tin" + "items": "#forge:storage_blocks/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json index 762579d22..0178edb7d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json index f2b76d35a..00731b61f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json index 69db4078a..55720321d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/tin" + "items": "#forge:storage_blocks/tin" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/tin" + "items": "#forge:ingots/tin" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json b/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json index 5837950d8..07c7f40cc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/steel" + "items": "#forge:ingots/steel" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json index 18ac3bff8..98b34e7ff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:logs" + "items": "#minecraft:logs" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "minecraft:logs" + "items": "#minecraft:logs" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json index 13d137bbf..e317aba48 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "minecraft:logs" + "items": "#minecraft:logs" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json index 1118f0231..bcfa45504 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/zinc" + "items": "#forge:nuggets/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json index 901ee1128..8c94f524a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json index 29b0e52d0..78299a95c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json index 330876d6a..d2123e1a7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json index 70f6c2532..2910b0c2d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json index 8387b1fa2..0478adf37 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/zinc" + "items": "#forge:storage_blocks/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json index 1935e829b..4d5e5d56f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json index c8bcdc469..cccc20a42 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json index 4a637a1fa..311d2e775 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json index eba1db1fa..6bbc7ac54 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/zinc" + "items": "#forge:nuggets/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json index 7bf6742a8..11bfeb319 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json index 648e3dc95..925c0b65c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/zinc" + "items": "#forge:storage_blocks/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json index c30fbab59..26ae96a76 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:gears/zinc" + "items": "#forge:gears/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json index 1f9062445..ce95ba398 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json index aca60123d..64ec69976 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json index 54acfc51f..db27603f3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json index 17ce15d59..a52ddc187 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json index 477e597b6..6bbaf179f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json index b820d88e1..663ad57aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:wool" + "items": "#minecraft:wool" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json index 629a2ee63..f5822aba1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:nuggets/zinc" + "items": "#forge:nuggets/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json index 04e388a2c..ea56bc7dd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json index 5ecf8966c..bbe74aac4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/zinc" + "items": "#forge:rods/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json index 12043a9cd..752d568b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json index 0a2e2379b..5c3236192 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json index f72083fad..b7884fba3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json index c8fa7c680..5401d0450 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:tiny_dusts/zinc" + "items": "#forge:tiny_dusts/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json index 1d97163a7..2b6552654 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_blasting.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_blasting.json index ec0c7547c..94de9bbe9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_blasting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_blasting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/zinc" + "items": "#forge:raw_materials/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_smelting.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_smelting.json index b1f6cf52b..56bd4f7d9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_smelting.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_raw_smelting.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:raw_materials/zinc" + "items": "#forge:raw_materials/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json index 01eac96bf..3373240a7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json index 2ff47ab39..52a78ac10 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json index 36623501b..6924a6272 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json index c258649f7..19377fea6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "minecraft:planks" + "items": "#minecraft:planks" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -25,7 +25,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json index b188a8cd0..4ed839bdc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json index 87b37de67..edc972cd0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/zinc" + "items": "#forge:storage_blocks/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json index 24f0c4507..215870761 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:dusts/zinc" + "items": "#forge:dusts/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json index a6a34fca6..c746726f3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/zinc" + "items": "#forge:storage_blocks/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json index 32e78c760..de91c0f3a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json index 376c52132..e2ebc19ab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json index 6fea71268..1c5436e21 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:storage_blocks/zinc" + "items": "#forge:storage_blocks/zinc" } ] }, @@ -15,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/zinc" + "items": "#forge:ingots/zinc" } ] }, diff --git a/src/generated/resources/data/basemetals/advancements/scuba_diver.json b/src/generated/resources/data/basemetals/advancements/scuba_diver.json index 7e1fa41f4..9701256c5 100644 --- a/src/generated/resources/data/basemetals/advancements/scuba_diver.json +++ b/src/generated/resources/data/basemetals/advancements/scuba_diver.json @@ -12,7 +12,7 @@ }, "frame": "challenge", "icon": { - "item": "basemetals:aquarium_helmet" + "id": "basemetals:aquarium_helmet" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/steel_maker.json b/src/generated/resources/data/basemetals/advancements/steel_maker.json index 7114fc256..ca631c1e6 100644 --- a/src/generated/resources/data/basemetals/advancements/steel_maker.json +++ b/src/generated/resources/data/basemetals/advancements/steel_maker.json @@ -12,7 +12,7 @@ }, "frame": "goal", "icon": { - "item": "basemetals:steel_blend" + "id": "basemetals:steel_blend" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/advancements/this_is_new.json b/src/generated/resources/data/basemetals/advancements/this_is_new.json index 244c5126b..d614be640 100644 --- a/src/generated/resources/data/basemetals/advancements/this_is_new.json +++ b/src/generated/resources/data/basemetals/advancements/this_is_new.json @@ -12,7 +12,7 @@ }, "frame": "task", "icon": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" }, "show_toast": true, "title": { diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json index 298b29223..49a53e1d5 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/adamantine_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json index 3a62013a3..7ed351890 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/antimony_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json index 1899a0de1..e8d447164 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/bismuth_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json index 2dca4fedc..4c5506caf 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/coldiron_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json index 086da5da4..9c43250fe 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/copper_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json index 38d95df1c..5a0af9b8f 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/lead_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json index ffcad206c..891ca359b 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/mercury_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json index 3f03486da..90a306677 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/nickel_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json index e023aea52..5d14e43bb 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/platinum_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json index aea70997c..fc20e7186 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/silver_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json index 9184fb602..2e384db10 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/starsteel_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json index 5c18e1ffe..dd1642a42 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/tin_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json b/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json index 9f11a7aa6..d05a8a9c8 100644 --- a/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json +++ b/src/generated/resources/data/basemetals/loot_tables/blocks/zinc_ore.json @@ -12,14 +12,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/basemetals/recipes/activator_rail.json b/src/generated/resources/data/basemetals/recipes/activator_rail.json index ca0900ee3..633c62d6b 100644 --- a/src/generated/resources/data/basemetals/recipes/activator_rail.json +++ b/src/generated/resources/data/basemetals/recipes/activator_rail.json @@ -21,7 +21,7 @@ "XSX" ], "result": { - "item": "minecraft:activator_rail" + "id": "minecraft:activator_rail" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json b/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json index 8f05af8a9..10cf9a50e 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json @@ -18,7 +18,7 @@ "III" ], "result": { - "item": "basemetals:adamantine_anvil" + "id": "basemetals:adamantine_anvil" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json b/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json index 4064110dd..28e9163da 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:adamantine_arrow" + "id": "basemetals:adamantine_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_arrow_recycling.json index 3062c9f67..e5b488e94 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_arrow" }, "result": { - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_axe.json b/src/generated/resources/data/basemetals/recipes/adamantine_axe.json index b656b4ca7..6707928e8 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_axe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:adamantine_axe" + "id": "basemetals:adamantine_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_axe_recycling.json index 40d58793c..20b9bde00 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars.json b/src/generated/resources/data/basemetals/recipes/adamantine_bars.json index e8bdbfde3..a117df474 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bars.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:adamantine_bars" + "id": "basemetals:adamantine_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json b/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json index a27058d7d..20d1327f0 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:adamantine_bars" + "id": "basemetals:adamantine_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_bars_recycling.json index d2ed25585..4814d9feb 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block.json b/src/generated/resources/data/basemetals/recipes/adamantine_block.json index e3ff9f0fc..eeb11e419 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_block.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:adamantine_block" + "id": "basemetals:adamantine_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block_crushing.json b/src/generated/resources/data/basemetals/recipes/adamantine_block_crushing.json index 0889576c9..e00026ff3 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:adamantine_powder" + "id": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json index 49e63f213..ac05d9691 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json b/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json index 02d864e47..c599b1dca 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:adamantine_bolt" + "id": "basemetals:adamantine_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_bolt_recycling.json index 7e34ea992..84e259890 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_boots.json b/src/generated/resources/data/basemetals/recipes/adamantine_boots.json index 215c48276..978ab5aa6 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_boots.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:adamantine_boots" + "id": "basemetals:adamantine_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_boots_recycling.json index 3f0b4fc5d..9e398a48b 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bow.json b/src/generated/resources/data/basemetals/recipes/adamantine_bow.json index 5aa938635..26eebed94 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bow.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:adamantine_bow" + "id": "basemetals:adamantine_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_bow_recycling.json index c329fce97..43b3d13f7 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_bow" }, "result": { - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_button.json b/src/generated/resources/data/basemetals/recipes/adamantine_button.json index 812a6b76a..da4e13c12 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_button.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:adamantine_button" + "id": "basemetals:adamantine_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_button_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_button_recycling.json index 68f600b1f..cd8b80655 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json b/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json index 45d74ac9a..2f99b5614 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:adamantine_chestplate" + "id": "basemetals:adamantine_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_chestplate_recycling.json index 4a2645aa3..acbd147c0 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json index 065fd895c..fc7a4e67d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:adamantine_crackhammer" + "id": "basemetals:adamantine_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer_recycling.json index cf6653de4..1dd837804 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_crackhammer" }, "result": { - "item": "basemetals:adamantine_block" + "id": "basemetals:adamantine_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json b/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json index 7cb6ba09b..f7d337120 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:adamantine_crossbow" + "id": "basemetals:adamantine_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_crossbow_recycling.json index c84d0e5fe..e067a9fa2 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_door.json b/src/generated/resources/data/basemetals/recipes/adamantine_door.json index d6fe599e7..01bc54fed 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_door.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:adamantine_door" + "id": "basemetals:adamantine_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_door_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_door_recycling.json index fdf42158d..4dbb4c4f7 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json index 958f1cb99..cf66fba59 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:adamantine_fishing_rod" + "id": "basemetals:adamantine_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_gear.json b/src/generated/resources/data/basemetals/recipes/adamantine_gear.json index fa4328397..6305f194f 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_gear.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:adamantine_gear" + "id": "basemetals:adamantine_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_gear_recycling.json index 96ba22145..8634a5d4c 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_gear" }, "result": { - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json b/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json index b977c15b0..3d47232c1 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:adamantine_helmet" + "id": "basemetals:adamantine_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_helmet_recycling.json index e4bf35b42..47b6ed58a 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json b/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json index a5e38f145..6ade2c22a 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:adamantine_hoe" + "id": "basemetals:adamantine_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_hoe_recycling.json index f9e27371a..2e23da2aa 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json index e7aa3b248..271b1a7cd 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:adamantine_horse_armor" + "id": "basemetals:adamantine_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/adamantine_ingot_crushing.json index 8fcbc0521..9346728d0 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/adamantine" }, "result": { - "item": "basemetals:adamantine_powder" + "id": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json index 4d4b3d901..9045a8ccc 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json b/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json index 9788a1977..0098620e6 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:adamantine_leggings" + "id": "basemetals:adamantine_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_leggings_recycling.json index dac34e28e..3fed48785 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_lever.json b/src/generated/resources/data/basemetals/recipes/adamantine_lever.json index 4f7fb70ec..52c47a6d1 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_lever.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:adamantine_lever" + "id": "basemetals:adamantine_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_lever_recycling.json index d171d52f2..ddd91f658 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_lever" }, "result": { - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/adamantine_nugget_crushing.json index 3e4dff188..0d90d7b04 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/adamantine" }, "result": { - "item": "basemetals:adamantine_smallpowder" + "id": "basemetals:adamantine_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json b/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json index 9ac3416c0..f08c0cf26 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/adamantine_ore_blasting.json index 43f2f8d56..e9c11db09 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/adamantine" }, - "result": "basemetals:adamantine_ingot" + "result": { + "id": "basemetals:adamantine_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/adamantine_ore_crushing.json index 6f24a8eb6..d003f70b3 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_powder" + "id": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/adamantine_ore_smelting.json index bbe6e9bc8..59aa367db 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/adamantine" }, - "result": "basemetals:adamantine_ingot" + "result": { + "id": "basemetals:adamantine_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json index 0c8c5e819..3f7429e7d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:adamantine_pickaxe" + "id": "basemetals:adamantine_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe_recycling.json index a518e32b5..b67d2b937 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_plate.json b/src/generated/resources/data/basemetals/recipes/adamantine_plate.json index 21d7a86d5..8e635140a 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_plate.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:adamantine_plate" + "id": "basemetals:adamantine_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_plate_recycling.json index b901f236d..ecbd8e67d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_plate" }, "result": { - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json index 6401241e0..c014fd25f 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:adamantine_powder" + "id": "basemetals:adamantine_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/adamantine_powder_smelting.json index b96ce074e..109ec692e 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/adamantine" }, - "result": "basemetals:adamantine_ingot" + "result": { + "id": "basemetals:adamantine_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json index 4a7860077..b6c0aff82 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:adamantine_pressure_plate" + "id": "basemetals:adamantine_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate_recycling.json index c6970f0bb..2eced003b 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/adamantine_raw_blasting.json index 812f1e371..b475cc632 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/adamantine" }, - "result": "basemetals:adamantine_ingot" + "result": { + "id": "basemetals:adamantine_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/adamantine_raw_crushing.json index 56a730dd9..01fbd905d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/adamantine" }, "result": { - "item": "basemetals:adamantine_powder" + "id": "basemetals:adamantine_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/adamantine_raw_smelting.json index b9f56f6ab..8dbb30797 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/adamantine" }, - "result": "basemetals:adamantine_ingot" + "result": { + "id": "basemetals:adamantine_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_rod.json b/src/generated/resources/data/basemetals/recipes/adamantine_rod.json index 2dd9a12ec..181d967de 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_rod.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:adamantine_rod" + "id": "basemetals:adamantine_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_rod_recycling.json index a701aa112..ed7efc053 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json b/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json index 413dc03a4..c54a773e9 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:adamantine_scythe" + "id": "basemetals:adamantine_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shears.json b/src/generated/resources/data/basemetals/recipes/adamantine_shears.json index fa3ae3bf0..38eeb1e86 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shears.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:adamantine_shears" + "id": "basemetals:adamantine_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_shears_recycling.json index e058391c9..075036509 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shield.json b/src/generated/resources/data/basemetals/recipes/adamantine_shield.json index 498fe1294..d5d3f965b 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shield.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:adamantine_shield" + "id": "basemetals:adamantine_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json b/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json index 6bf331490..dc843b681 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:adamantine_shovel" + "id": "basemetals:adamantine_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_shovel_recycling.json index 5e4c42b20..5d7d0b166 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_shovel" }, "result": { - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_slab.json b/src/generated/resources/data/basemetals/recipes/adamantine_slab.json index b542b57ad..4c400e4a8 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_slab.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:adamantine_slab" + "id": "basemetals:adamantine_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_slab_recycling.json index 09a0a5062..8c253dbfc 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:adamantine_nugget" + "id": "basemetals:adamantine_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json index b6f4e7991..f0db907f3 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:adamantine_smallpowder" + "id": "basemetals:adamantine_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder_smelting.json index 2d9a24d28..60fb0b30d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/adamantine" }, - "result": "basemetals:adamantine_nugget" + "result": { + "id": "basemetals:adamantine_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json b/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json index 3165515e6..1559a2da4 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:adamantine_stairs" + "id": "basemetals:adamantine_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_sword.json b/src/generated/resources/data/basemetals/recipes/adamantine_sword.json index f768f466d..8c970cf21 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_sword.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:adamantine_sword" + "id": "basemetals:adamantine_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_sword_recycling.json index 07571075b..399725d71 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json index a546ed0fe..03b9aa8ff 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:adamantine_trapdoor" + "id": "basemetals:adamantine_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor_recycling.json index 944942aab..95ac4a3b7 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:adamantine_ingot" + "id": "basemetals:adamantine_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_wall.json b/src/generated/resources/data/basemetals/recipes/adamantine_wall.json index de9ddeaf7..e0c58fd5f 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_wall.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:adamantine_wall" + "id": "basemetals:adamantine_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/adamantine_wall_recycling.json index d9aa4213e..9aa5d54da 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:adamantine_wall" }, "result": { - "item": "basemetals:adamantine_block" + "id": "basemetals:adamantine_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/ancient_debris_crushing.json b/src/generated/resources/data/basemetals/recipes/ancient_debris_crushing.json index 15c78140c..3bf8930d4 100644 --- a/src/generated/resources/data/basemetals/recipes/ancient_debris_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/ancient_debris_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:netherite_scrap" + "id": "minecraft:netherite_scrap" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_arrow.json b/src/generated/resources/data/basemetals/recipes/antimony_arrow.json index 14d23b83e..3e549ee9c 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:antimony_arrow" + "id": "basemetals:antimony_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_arrow_recycling.json index e541d80b5..46afd480f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_arrow" }, "result": { - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_axe.json b/src/generated/resources/data/basemetals/recipes/antimony_axe.json index bc663accc..0c602a06e 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_axe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:antimony_axe" + "id": "basemetals:antimony_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_axe_recycling.json index 8a0bda12f..cd60b00a4 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars.json b/src/generated/resources/data/basemetals/recipes/antimony_bars.json index da4aa18e8..37daf480b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bars.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:antimony_bars" + "id": "basemetals:antimony_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json b/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json index 5ba3c367b..5f2d9944d 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:antimony_bars" + "id": "basemetals:antimony_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_bars_recycling.json index 41517f497..d0311425f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block.json b/src/generated/resources/data/basemetals/recipes/antimony_block.json index 0cbe95122..c1c254598 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_block.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:antimony_block" + "id": "basemetals:antimony_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block_crushing.json b/src/generated/resources/data/basemetals/recipes/antimony_block_crushing.json index cd4ff985f..344ccf29c 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:antimony_powder" + "id": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json b/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json index 6e0c37124..ec3ecf72f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bolt.json b/src/generated/resources/data/basemetals/recipes/antimony_bolt.json index 53fb5f67d..78e7bdc01 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:antimony_bolt" + "id": "basemetals:antimony_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_bolt_recycling.json index 1d2057b5c..781e9248c 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_boots.json b/src/generated/resources/data/basemetals/recipes/antimony_boots.json index 5d9cbe49f..27cdcf01e 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_boots.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:antimony_boots" + "id": "basemetals:antimony_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_boots_recycling.json index d5bcc3320..f0c9cfa08 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bow.json b/src/generated/resources/data/basemetals/recipes/antimony_bow.json index d29193a39..355507e0f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bow.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:antimony_bow" + "id": "basemetals:antimony_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_bow_recycling.json index 44bd6419c..9d922d121 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_bow" }, "result": { - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_button.json b/src/generated/resources/data/basemetals/recipes/antimony_button.json index be4ffe0ad..6f060d8af 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_button.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:antimony_button" + "id": "basemetals:antimony_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_button_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_button_recycling.json index e124efc43..2167189a7 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json b/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json index 0e2016e12..8deb1f196 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:antimony_chestplate" + "id": "basemetals:antimony_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_chestplate_recycling.json index 166e793c7..c1c82cab3 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json b/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json index f16ddb036..62649df12 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:antimony_crackhammer" + "id": "basemetals:antimony_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_crackhammer_recycling.json index 5bb64ad76..d066a547c 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_crackhammer" }, "result": { - "item": "basemetals:antimony_block" + "id": "basemetals:antimony_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json b/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json index cd64e2a0e..a9a358465 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:antimony_crossbow" + "id": "basemetals:antimony_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_crossbow_recycling.json index 59c733f35..79c51f85b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_door.json b/src/generated/resources/data/basemetals/recipes/antimony_door.json index 115b8c09e..9b312293f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_door.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:antimony_door" + "id": "basemetals:antimony_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_door_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_door_recycling.json index 6a42dc71b..8e72fbf16 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json b/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json index 441170054..2a1512c9c 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:antimony_fishing_rod" + "id": "basemetals:antimony_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_gear.json b/src/generated/resources/data/basemetals/recipes/antimony_gear.json index c5876d035..9433b4dea 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_gear.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:antimony_gear" + "id": "basemetals:antimony_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_gear_recycling.json index 77cbbbd3c..576c57215 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_gear" }, "result": { - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_helmet.json b/src/generated/resources/data/basemetals/recipes/antimony_helmet.json index 57cb760c9..16301ef4e 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:antimony_helmet" + "id": "basemetals:antimony_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_helmet_recycling.json index 69db9dcc7..ed894be66 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_hoe.json b/src/generated/resources/data/basemetals/recipes/antimony_hoe.json index 896dd2f5a..10ea5d7c3 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:antimony_hoe" + "id": "basemetals:antimony_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_hoe_recycling.json index ff025fc21..5420b665f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json b/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json index ec5e078f5..fad46faed 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:antimony_horse_armor" + "id": "basemetals:antimony_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/antimony_ingot_crushing.json index 31c260983..51a6b75d9 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/antimony" }, "result": { - "item": "basemetals:antimony_powder" + "id": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json index bac36234e..788f2a589 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_leggings.json b/src/generated/resources/data/basemetals/recipes/antimony_leggings.json index 43ceaadb3..09bc87430 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:antimony_leggings" + "id": "basemetals:antimony_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_leggings_recycling.json index 11aa1d2fc..9c7086d20 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_lever.json b/src/generated/resources/data/basemetals/recipes/antimony_lever.json index 2190f785b..3d699416b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_lever.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:antimony_lever" + "id": "basemetals:antimony_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_lever_recycling.json index 843ea0b7e..d146bcad1 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_lever" }, "result": { - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/antimony_nugget_crushing.json index b30d3003f..cf2453879 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/antimony" }, "result": { - "item": "basemetals:antimony_smallpowder" + "id": "basemetals:antimony_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json b/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json index 5622aa6f2..e3338ae79 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/antimony_ore_blasting.json index c68cacf11..3c04ef788 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/antimony" }, - "result": "basemetals:antimony_ingot" + "result": { + "id": "basemetals:antimony_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/antimony_ore_crushing.json index 6354f2223..efc89fed0 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_powder" + "id": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/antimony_ore_smelting.json index bc1d575c3..d46feac12 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/antimony" }, - "result": "basemetals:antimony_ingot" + "result": { + "id": "basemetals:antimony_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json b/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json index 3584b12fa..9fe341fa1 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:antimony_pickaxe" + "id": "basemetals:antimony_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_pickaxe_recycling.json index eb123dc33..2d4092a51 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_plate.json b/src/generated/resources/data/basemetals/recipes/antimony_plate.json index 4cd274207..81eaa68b6 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_plate.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:antimony_plate" + "id": "basemetals:antimony_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_plate_recycling.json index caf7e4922..a7ef8f1d7 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_plate" }, "result": { - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json index 88e3e7807..9445bd7c1 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:antimony_powder" + "id": "basemetals:antimony_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/antimony_powder_smelting.json index 376be932c..8c4a5cf3f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/antimony" }, - "result": "basemetals:antimony_ingot" + "result": { + "id": "basemetals:antimony_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json index 4683ad841..7aab1ab99 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:antimony_pressure_plate" + "id": "basemetals:antimony_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate_recycling.json index 03450b87f..8708bc57f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/antimony_raw_blasting.json index 5bc26cad0..29dd5c890 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/antimony" }, - "result": "basemetals:antimony_ingot" + "result": { + "id": "basemetals:antimony_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/antimony_raw_crushing.json index e2cf00615..6154c6f3e 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/antimony" }, "result": { - "item": "basemetals:antimony_powder" + "id": "basemetals:antimony_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/antimony_raw_smelting.json index 517775a13..2078722b9 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/antimony" }, - "result": "basemetals:antimony_ingot" + "result": { + "id": "basemetals:antimony_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_rod.json b/src/generated/resources/data/basemetals/recipes/antimony_rod.json index 108c7b6e7..b75daae01 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_rod.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:antimony_rod" + "id": "basemetals:antimony_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_rod_recycling.json index 943528770..a563663b3 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_scythe.json b/src/generated/resources/data/basemetals/recipes/antimony_scythe.json index 1ab4937a6..0431f60b4 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:antimony_scythe" + "id": "basemetals:antimony_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shears.json b/src/generated/resources/data/basemetals/recipes/antimony_shears.json index f58f0eb3b..8de4e3724 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shears.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:antimony_shears" + "id": "basemetals:antimony_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_shears_recycling.json index acfbe1b14..6a39e0141 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shield.json b/src/generated/resources/data/basemetals/recipes/antimony_shield.json index 0d8dade32..5f8e6598b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shield.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:antimony_shield" + "id": "basemetals:antimony_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shovel.json b/src/generated/resources/data/basemetals/recipes/antimony_shovel.json index 107b3e5f8..050003c97 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:antimony_shovel" + "id": "basemetals:antimony_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_shovel_recycling.json index c98fd7b62..1345c4c07 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_shovel" }, "result": { - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_slab.json b/src/generated/resources/data/basemetals/recipes/antimony_slab.json index 4ff1d5b90..c46c96093 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_slab.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:antimony_slab" + "id": "basemetals:antimony_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_slab_recycling.json index 536d03c02..140e2df88 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:antimony_nugget" + "id": "basemetals:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json b/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json index 77a8c6660..41a8f9e39 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:antimony_smallpowder" + "id": "basemetals:antimony_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/antimony_smallpowder_smelting.json index 916fa34bb..afae0b871 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/antimony" }, - "result": "basemetals:antimony_nugget" + "result": { + "id": "basemetals:antimony_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_stairs.json b/src/generated/resources/data/basemetals/recipes/antimony_stairs.json index 223b2359c..2b11ca4a4 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:antimony_stairs" + "id": "basemetals:antimony_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_sword.json b/src/generated/resources/data/basemetals/recipes/antimony_sword.json index cc2d23288..ea1f68aef 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_sword.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:antimony_sword" + "id": "basemetals:antimony_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_sword_recycling.json index 9cf5cd6cb..9512682b9 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json b/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json index aeaac5cbc..fa075b509 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:antimony_trapdoor" + "id": "basemetals:antimony_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_trapdoor_recycling.json index 394d402b7..86d8dbed4 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:antimony_ingot" + "id": "basemetals:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_wall.json b/src/generated/resources/data/basemetals/recipes/antimony_wall.json index 83de30641..778290634 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_wall.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:antimony_wall" + "id": "basemetals:antimony_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/antimony_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/antimony_wall_recycling.json index 88ab936eb..9360eb7af 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:antimony_wall" }, "result": { - "item": "basemetals:antimony_block" + "id": "basemetals:antimony_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json b/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json index a66b4801c..0b4dbbf37 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:aquarium_arrow" + "id": "basemetals:aquarium_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_arrow_recycling.json index 6f81a3874..88d87cd65 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_arrow" }, "result": { - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_axe.json b/src/generated/resources/data/basemetals/recipes/aquarium_axe.json index 0b9fc3d3b..0eef37726 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_axe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:aquarium_axe" + "id": "basemetals:aquarium_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_axe_recycling.json index 204e03598..6ad848655 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars.json b/src/generated/resources/data/basemetals/recipes/aquarium_bars.json index 0d10766db..f7c4f1b0a 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bars.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:aquarium_bars" + "id": "basemetals:aquarium_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json b/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json index 685685cdc..25c253aab 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:aquarium_bars" + "id": "basemetals:aquarium_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_bars_recycling.json index 586427bf0..52068c2fa 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend.json b/src/generated/resources/data/basemetals/recipes/aquarium_blend.json index caa60623a..56dd1446e 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_blend.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_blend.json @@ -20,7 +20,7 @@ ], "result": { "count": 3, - "item": "basemetals:aquarium_blend" + "id": "basemetals:aquarium_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json index 91ff23d0e..55a8e4980 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:aquarium_blend" + "id": "basemetals:aquarium_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/aquarium_blend_smelting.json index 764133b77..1630ff74d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/aquarium" }, - "result": "basemetals:aquarium_ingot" + "result": { + "id": "basemetals:aquarium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block.json b/src/generated/resources/data/basemetals/recipes/aquarium_block.json index d4fbd030d..567707cef 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_block.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:aquarium_block" + "id": "basemetals:aquarium_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block_crushing.json b/src/generated/resources/data/basemetals/recipes/aquarium_block_crushing.json index bedb03ea0..a172aee8d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:aquarium_powder" + "id": "basemetals:aquarium_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json index 220e8752e..caad0260c 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json b/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json index dfc06ac69..be29cce7e 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:aquarium_bolt" + "id": "basemetals:aquarium_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_bolt_recycling.json index ce7df1bc0..c24646b93 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_boots.json b/src/generated/resources/data/basemetals/recipes/aquarium_boots.json index b585a7e14..54596e9e9 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_boots.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:aquarium_boots" + "id": "basemetals:aquarium_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_boots_recycling.json index 5f7d4cac3..80d8501bf 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bow.json b/src/generated/resources/data/basemetals/recipes/aquarium_bow.json index 42f5cdce1..91a72d2af 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bow.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:aquarium_bow" + "id": "basemetals:aquarium_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_bow_recycling.json index 1aad38fef..fccf2f31a 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_bow" }, "result": { - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_button.json b/src/generated/resources/data/basemetals/recipes/aquarium_button.json index 7e5f0bf66..db30a0356 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_button.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:aquarium_button" + "id": "basemetals:aquarium_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_button_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_button_recycling.json index 39831c256..12166c598 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json b/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json index e35423c58..fe6f74a96 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:aquarium_chestplate" + "id": "basemetals:aquarium_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_chestplate_recycling.json index e798854f0..6c7369306 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json index a6342a2c7..b262e0016 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:aquarium_crackhammer" + "id": "basemetals:aquarium_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer_recycling.json index 12d27b2b5..4fadd6dd0 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_crackhammer" }, "result": { - "item": "basemetals:aquarium_block" + "id": "basemetals:aquarium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json b/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json index ae0710862..63bc92d11 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:aquarium_crossbow" + "id": "basemetals:aquarium_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_crossbow_recycling.json index 2ff4cbe4b..ab910e537 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_door.json b/src/generated/resources/data/basemetals/recipes/aquarium_door.json index 80cb5ff32..ae4c53b63 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_door.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:aquarium_door" + "id": "basemetals:aquarium_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_door_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_door_recycling.json index b06c518c0..c60f3dfbf 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json index 25d8f9aa6..bd281f976 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:aquarium_fishing_rod" + "id": "basemetals:aquarium_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_gear.json b/src/generated/resources/data/basemetals/recipes/aquarium_gear.json index 24f23a889..22c679db4 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_gear.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:aquarium_gear" + "id": "basemetals:aquarium_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_gear_recycling.json index 33b83fb83..8a53b98c3 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_gear" }, "result": { - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json b/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json index b4ae598f1..26f1ad8b0 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:aquarium_helmet" + "id": "basemetals:aquarium_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_helmet_recycling.json index 923ec9f04..9635f0167 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json b/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json index 3993e06d9..8f0e1a6c8 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:aquarium_hoe" + "id": "basemetals:aquarium_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_hoe_recycling.json index 8c18856f1..22ed7d466 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json index 7dad8b4c0..924e6f70d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:aquarium_horse_armor" + "id": "basemetals:aquarium_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/aquarium_ingot_crushing.json index 454a2d9e1..7dbbc253d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/aquarium" }, "result": { - "item": "basemetals:aquarium_powder" + "id": "basemetals:aquarium_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json index 7cd658d0f..759b8114d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json b/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json index 1ce013d6b..82c984f42 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:aquarium_leggings" + "id": "basemetals:aquarium_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_leggings_recycling.json index 287554826..fe4213f18 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_lever.json b/src/generated/resources/data/basemetals/recipes/aquarium_lever.json index b6fb520ea..acee32af4 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_lever.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:aquarium_lever" + "id": "basemetals:aquarium_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_lever_recycling.json index 593996950..f647fa98a 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_lever" }, "result": { - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/aquarium_nugget_crushing.json index 04711095a..feeb619ce 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/aquarium" }, "result": { - "item": "basemetals:aquarium_smallpowder" + "id": "basemetals:aquarium_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json b/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json index 7fb2ebd5e..6ca33363a 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json index cd8bf0597..52b8c479a 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:aquarium_pickaxe" + "id": "basemetals:aquarium_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe_recycling.json index d9c983c24..87eadc0c7 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_plate.json b/src/generated/resources/data/basemetals/recipes/aquarium_plate.json index 5f624c66d..6bfe30944 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_plate.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:aquarium_plate" + "id": "basemetals:aquarium_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_plate_recycling.json index d17347aee..0edd46b14 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_plate" }, "result": { - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json index 7bc5cbfb4..bef4b7d54 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:aquarium_powder" + "id": "basemetals:aquarium_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/aquarium_powder_smelting.json index 6f49b0da2..c45d195b5 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/aquarium" }, - "result": "basemetals:aquarium_ingot" + "result": { + "id": "basemetals:aquarium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json index 53c892722..5bfadcb48 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:aquarium_pressure_plate" + "id": "basemetals:aquarium_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate_recycling.json index 1b6c237b3..7e14b684e 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_rod.json b/src/generated/resources/data/basemetals/recipes/aquarium_rod.json index d0669af6c..d67316af1 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_rod.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:aquarium_rod" + "id": "basemetals:aquarium_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_rod_recycling.json index cdd5861e3..8d210522d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json b/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json index d787c071c..6f0e178c7 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:aquarium_scythe" + "id": "basemetals:aquarium_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shears.json b/src/generated/resources/data/basemetals/recipes/aquarium_shears.json index 995fe607f..a8ba67669 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shears.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:aquarium_shears" + "id": "basemetals:aquarium_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_shears_recycling.json index c28a64fd0..65b042a44 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shield.json b/src/generated/resources/data/basemetals/recipes/aquarium_shield.json index 0e1e545ef..8a67b8dfb 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shield.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:aquarium_shield" + "id": "basemetals:aquarium_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json b/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json index 45479aa73..0070121b1 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:aquarium_shovel" + "id": "basemetals:aquarium_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_shovel_recycling.json index aecf03618..d6f405b52 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_shovel" }, "result": { - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_slab.json b/src/generated/resources/data/basemetals/recipes/aquarium_slab.json index 4a1d1f1fe..41c603e59 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_slab.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:aquarium_slab" + "id": "basemetals:aquarium_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_slab_recycling.json index e74bd5db9..d2d4eb8ed 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:aquarium_nugget" + "id": "basemetals:aquarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json b/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json index 779f50efd..dc20f4f2b 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:aquarium_smallblend" + "id": "basemetals:aquarium_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/aquarium_smallblend_smelting.json index 7340713ec..1443fd1df 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/aquarium" }, - "result": "basemetals:aquarium_nugget" + "result": { + "id": "basemetals:aquarium_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json index 25b4991bc..426e3e82e 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:aquarium_smallpowder" + "id": "basemetals:aquarium_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder_smelting.json index 83d9af983..fc3dda91d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/aquarium" }, - "result": "basemetals:aquarium_nugget" + "result": { + "id": "basemetals:aquarium_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json b/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json index 5de23fa39..2eb2688f6 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:aquarium_stairs" + "id": "basemetals:aquarium_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_sword.json b/src/generated/resources/data/basemetals/recipes/aquarium_sword.json index 14dfe032a..1356f3500 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_sword.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:aquarium_sword" + "id": "basemetals:aquarium_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_sword_recycling.json index fe978c461..3f01f7c90 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json index e9ad0e6f0..45e183895 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:aquarium_trapdoor" + "id": "basemetals:aquarium_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor_recycling.json index fb7eb7401..5495a2e4c 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:aquarium_ingot" + "id": "basemetals:aquarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_wall.json b/src/generated/resources/data/basemetals/recipes/aquarium_wall.json index 8618aaaa8..20083461d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_wall.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:aquarium_wall" + "id": "basemetals:aquarium_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/aquarium_wall_recycling.json index b4e36ebbb..8dc57ea4d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:aquarium_wall" }, "result": { - "item": "basemetals:aquarium_block" + "id": "basemetals:aquarium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json b/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json index 7e283a517..8fdb51461 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:bismuth_arrow" + "id": "basemetals:bismuth_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_arrow_recycling.json index 88d82629e..ec9bdb05f 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_arrow" }, "result": { - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_axe.json b/src/generated/resources/data/basemetals/recipes/bismuth_axe.json index 5408e0386..1c88dea63 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_axe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:bismuth_axe" + "id": "basemetals:bismuth_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_axe_recycling.json index 782ede192..4fc95ecc1 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars.json b/src/generated/resources/data/basemetals/recipes/bismuth_bars.json index 5651ede8a..92e6c747e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bars.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:bismuth_bars" + "id": "basemetals:bismuth_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json b/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json index 5c9000548..915a902a2 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:bismuth_bars" + "id": "basemetals:bismuth_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_bars_recycling.json index 0a3463095..38306d097 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block.json b/src/generated/resources/data/basemetals/recipes/bismuth_block.json index b954cb00f..3f670f793 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_block.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bismuth_block" + "id": "basemetals:bismuth_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block_crushing.json b/src/generated/resources/data/basemetals/recipes/bismuth_block_crushing.json index 6e63e12c2..057f40b69 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:bismuth_powder" + "id": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json index feb2ebd22..452fc2755 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json b/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json index 5942b68e3..a8e9b8b0a 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:bismuth_bolt" + "id": "basemetals:bismuth_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_bolt_recycling.json index 27d27ab4c..b5eb6b747 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_boots.json b/src/generated/resources/data/basemetals/recipes/bismuth_boots.json index 9a476b5a6..9838ae40a 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_boots.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:bismuth_boots" + "id": "basemetals:bismuth_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_boots_recycling.json index fc9f546b8..609686c5d 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bow.json b/src/generated/resources/data/basemetals/recipes/bismuth_bow.json index 211832a1c..911b7e834 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bow.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:bismuth_bow" + "id": "basemetals:bismuth_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_bow_recycling.json index db460e54e..949595b35 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_bow" }, "result": { - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_button.json b/src/generated/resources/data/basemetals/recipes/bismuth_button.json index b7713a2cd..4c3802b16 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_button.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:bismuth_button" + "id": "basemetals:bismuth_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_button_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_button_recycling.json index 65a673f69..ea6aac5fe 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json b/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json index b660b714d..23617c002 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bismuth_chestplate" + "id": "basemetals:bismuth_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_chestplate_recycling.json index 4f91b237e..d78264fdc 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json index 9f8dd6e59..3ff697089 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:bismuth_crackhammer" + "id": "basemetals:bismuth_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer_recycling.json index 6a88c667c..f52718c07 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_crackhammer" }, "result": { - "item": "basemetals:bismuth_block" + "id": "basemetals:bismuth_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json b/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json index 0b8090b82..6909bfecd 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:bismuth_crossbow" + "id": "basemetals:bismuth_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_crossbow_recycling.json index 7e4916890..e4659d25f 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_door.json b/src/generated/resources/data/basemetals/recipes/bismuth_door.json index de113e242..f64b6be9c 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_door.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:bismuth_door" + "id": "basemetals:bismuth_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_door_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_door_recycling.json index 465b347e4..32b6e752e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json index 2acb3b48a..02877d6c5 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:bismuth_fishing_rod" + "id": "basemetals:bismuth_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_gear.json b/src/generated/resources/data/basemetals/recipes/bismuth_gear.json index 5b8af0085..748fece43 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_gear.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:bismuth_gear" + "id": "basemetals:bismuth_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_gear_recycling.json index f85ca82c4..09406f94d 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_gear" }, "result": { - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json b/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json index 41fac420f..5f712ac51 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:bismuth_helmet" + "id": "basemetals:bismuth_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_helmet_recycling.json index 119cf89a2..b15207f9e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json b/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json index 8957d444d..cc577a92e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:bismuth_hoe" + "id": "basemetals:bismuth_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_hoe_recycling.json index 2a17d0018..a383f7e63 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json index 112515b62..9c1fd7bb1 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:bismuth_horse_armor" + "id": "basemetals:bismuth_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/bismuth_ingot_crushing.json index 402f63513..7613cc2ad 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/bismuth" }, "result": { - "item": "basemetals:bismuth_powder" + "id": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json index bf2b5cf28..56361d6b1 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json b/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json index ab1de5478..4b74f8369 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:bismuth_leggings" + "id": "basemetals:bismuth_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_leggings_recycling.json index 297feb4b6..e128677a9 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_lever.json b/src/generated/resources/data/basemetals/recipes/bismuth_lever.json index bcca57f90..2501c6926 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_lever.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:bismuth_lever" + "id": "basemetals:bismuth_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_lever_recycling.json index 96869dfa0..54aeff015 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_lever" }, "result": { - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/bismuth_nugget_crushing.json index 6a477114c..cab315b21 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/bismuth" }, "result": { - "item": "basemetals:bismuth_smallpowder" + "id": "basemetals:bismuth_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json b/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json index 9d746491d..455d59f0d 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/bismuth_ore_blasting.json index c7a6a740f..72c4ddd37 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/bismuth" }, - "result": "basemetals:bismuth_ingot" + "result": { + "id": "basemetals:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/bismuth_ore_crushing.json index 54f0922ab..59b1a03d6 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_powder" + "id": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/bismuth_ore_smelting.json index 27c434418..07526464a 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/bismuth" }, - "result": "basemetals:bismuth_ingot" + "result": { + "id": "basemetals:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json index cc7a7b8e0..eae41f3bf 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:bismuth_pickaxe" + "id": "basemetals:bismuth_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe_recycling.json index 72a7b4a61..bdb83bf15 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_plate.json b/src/generated/resources/data/basemetals/recipes/bismuth_plate.json index 748a45d16..515bcf350 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:bismuth_plate" + "id": "basemetals:bismuth_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_plate_recycling.json index 0e1053138..f10b5951c 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_plate" }, "result": { - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json index 73cc97d39..205392e08 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bismuth_powder" + "id": "basemetals:bismuth_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/bismuth_powder_smelting.json index 27a320cbb..8c5ad3681 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/bismuth" }, - "result": "basemetals:bismuth_ingot" + "result": { + "id": "basemetals:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json index 518eb5e6f..559b4cf9f 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:bismuth_pressure_plate" + "id": "basemetals:bismuth_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate_recycling.json index 78466e10c..5f24d0ff5 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/bismuth_raw_blasting.json index 5d0c7f3a4..3f6c16b94 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/bismuth" }, - "result": "basemetals:bismuth_ingot" + "result": { + "id": "basemetals:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/bismuth_raw_crushing.json index 2ea5a9a77..f9b77a319 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/bismuth" }, "result": { - "item": "basemetals:bismuth_powder" + "id": "basemetals:bismuth_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/bismuth_raw_smelting.json index 016acffb9..35aff9946 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/bismuth" }, - "result": "basemetals:bismuth_ingot" + "result": { + "id": "basemetals:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_rod.json b/src/generated/resources/data/basemetals/recipes/bismuth_rod.json index 50510cfb6..fb5f59c4e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_rod.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:bismuth_rod" + "id": "basemetals:bismuth_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_rod_recycling.json index 15fea2349..854ab62c6 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json b/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json index 2022548be..698fd5146 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:bismuth_scythe" + "id": "basemetals:bismuth_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shears.json b/src/generated/resources/data/basemetals/recipes/bismuth_shears.json index 8c6dda34b..ebfc72d70 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shears.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:bismuth_shears" + "id": "basemetals:bismuth_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_shears_recycling.json index d2e621014..dbcb3fcab 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shield.json b/src/generated/resources/data/basemetals/recipes/bismuth_shield.json index a9aaa932a..1512aeeda 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shield.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:bismuth_shield" + "id": "basemetals:bismuth_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json b/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json index e70d3f5fe..85c92fcae 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:bismuth_shovel" + "id": "basemetals:bismuth_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_shovel_recycling.json index 465a7e8b9..aec819810 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_shovel" }, "result": { - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_slab.json b/src/generated/resources/data/basemetals/recipes/bismuth_slab.json index 61166c8c2..ca8fd7215 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_slab.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:bismuth_slab" + "id": "basemetals:bismuth_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_slab_recycling.json index 38dfa5cca..24f5f1f28 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bismuth_nugget" + "id": "basemetals:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json index f8bd3f3a1..c864f4117 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bismuth_smallpowder" + "id": "basemetals:bismuth_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder_smelting.json index 1749cdbd9..dc5353709 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/bismuth" }, - "result": "basemetals:bismuth_nugget" + "result": { + "id": "basemetals:bismuth_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json b/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json index 0d16a6439..4a30ff102 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:bismuth_stairs" + "id": "basemetals:bismuth_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_sword.json b/src/generated/resources/data/basemetals/recipes/bismuth_sword.json index 870efb0d3..379371ef6 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_sword.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:bismuth_sword" + "id": "basemetals:bismuth_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_sword_recycling.json index 64b20f2ce..4fc98bc08 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json index 061cff866..300a454f8 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:bismuth_trapdoor" + "id": "basemetals:bismuth_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor_recycling.json index 8c99bc7ba..c5a0f45bb 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bismuth_ingot" + "id": "basemetals:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_wall.json b/src/generated/resources/data/basemetals/recipes/bismuth_wall.json index c8330ea24..cd3b34fe8 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_wall.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:bismuth_wall" + "id": "basemetals:bismuth_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/bismuth_wall_recycling.json index 691a22046..5e6b4de41 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bismuth_wall" }, "result": { - "item": "basemetals:bismuth_block" + "id": "basemetals:bismuth_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/blaze_rod_crushing.json b/src/generated/resources/data/basemetals/recipes/blaze_rod_crushing.json index f2f601512..fdbf16163 100644 --- a/src/generated/resources/data/basemetals/recipes/blaze_rod_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/blaze_rod_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:blaze_powder" + "id": "minecraft:blaze_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bone_block_crushing.json b/src/generated/resources/data/basemetals/recipes/bone_block_crushing.json index 669fb60d6..80e403af2 100644 --- a/src/generated/resources/data/basemetals/recipes/bone_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bone_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "minecraft:bone_meal" + "id": "minecraft:bone_meal" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bone_crushing.json b/src/generated/resources/data/basemetals/recipes/bone_crushing.json index 010070f50..421c0d40c 100644 --- a/src/generated/resources/data/basemetals/recipes/bone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bone_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 3, - "item": "minecraft:bone_meal" + "id": "minecraft:bone_meal" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_arrow.json b/src/generated/resources/data/basemetals/recipes/brass_arrow.json index 9a017328e..589567c93 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/brass_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_arrow" + "id": "basemetals:brass_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_arrow_recycling.json index e131376db..6dc8470a7 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_arrow" }, "result": { - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_axe.json b/src/generated/resources/data/basemetals/recipes/brass_axe.json index c0d38f2e0..5f885956b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_axe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:brass_axe" + "id": "basemetals:brass_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_axe_recycling.json index 440b994da..4d591d6eb 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars.json b/src/generated/resources/data/basemetals/recipes/brass_bars.json index c4aa3416b..e9dc14282 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bars.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:brass_bars" + "id": "basemetals:brass_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars_2.json b/src/generated/resources/data/basemetals/recipes/brass_bars_2.json index 865473bdb..54825f93b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_bars" + "id": "basemetals:brass_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_bars_recycling.json index 0c5fedc40..0570b7a0c 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend.json b/src/generated/resources/data/basemetals/recipes/brass_blend.json index da26a49a1..49f3443b0 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_blend.json +++ b/src/generated/resources/data/basemetals/recipes/brass_blend.json @@ -20,7 +20,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_blend" + "id": "basemetals:brass_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json index 93bbd41d7..575e5575f 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:brass_blend" + "id": "basemetals:brass_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/brass_blend_smelting.json index f0ddf9771..db67cb072 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/brass_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/brass" }, - "result": "basemetals:brass_ingot" + "result": { + "id": "basemetals:brass_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_block.json b/src/generated/resources/data/basemetals/recipes/brass_block.json index f5d6f7b63..40a490913 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_block.json +++ b/src/generated/resources/data/basemetals/recipes/brass_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:brass_block" + "id": "basemetals:brass_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_block_crushing.json b/src/generated/resources/data/basemetals/recipes/brass_block_crushing.json index be1693b86..29c39a1bb 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/brass_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:brass_powder" + "id": "basemetals:brass_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json b/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json index ffd52a101..a4a7d5da6 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bolt.json b/src/generated/resources/data/basemetals/recipes/brass_bolt.json index ef1dc6ccf..feeaedc3c 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_bolt" + "id": "basemetals:brass_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_bolt_recycling.json index 3a476437f..a0210e766 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_boots.json b/src/generated/resources/data/basemetals/recipes/brass_boots.json index 1dd92099b..89d70e0c8 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_boots.json +++ b/src/generated/resources/data/basemetals/recipes/brass_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:brass_boots" + "id": "basemetals:brass_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_boots_recycling.json index 9249d98c5..71d112a36 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bow.json b/src/generated/resources/data/basemetals/recipes/brass_bow.json index c8d856f07..7ccc928da 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bow.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:brass_bow" + "id": "basemetals:brass_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_bow_recycling.json index 3f7e509f7..f0f09c3cd 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_bow" }, "result": { - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_button.json b/src/generated/resources/data/basemetals/recipes/brass_button.json index 632b37add..22608df19 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_button.json +++ b/src/generated/resources/data/basemetals/recipes/brass_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:brass_button" + "id": "basemetals:brass_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_button_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_button_recycling.json index 213761efd..2fa47464e 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_chestplate.json b/src/generated/resources/data/basemetals/recipes/brass_chestplate.json index 42fae3605..5151f5d63 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/brass_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:brass_chestplate" + "id": "basemetals:brass_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_chestplate_recycling.json index 5bb350b9b..d84afc3b0 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json b/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json index c1e7d5e45..e1220a3a5 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:brass_crackhammer" + "id": "basemetals:brass_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_crackhammer_recycling.json index 7a86c9494..3f5f2d690 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_crackhammer" }, "result": { - "item": "basemetals:brass_block" + "id": "basemetals:brass_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_crossbow.json b/src/generated/resources/data/basemetals/recipes/brass_crossbow.json index 8400b1cde..3801d70b3 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/brass_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:brass_crossbow" + "id": "basemetals:brass_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_crossbow_recycling.json index f20e82c59..c21ed61c4 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_door.json b/src/generated/resources/data/basemetals/recipes/brass_door.json index 782c8c980..6ce0d3d8b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_door.json +++ b/src/generated/resources/data/basemetals/recipes/brass_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:brass_door" + "id": "basemetals:brass_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_door_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_door_recycling.json index 73521b808..940ea5ef4 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json b/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json index d56823fb0..56715039c 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:brass_fishing_rod" + "id": "basemetals:brass_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_gear.json b/src/generated/resources/data/basemetals/recipes/brass_gear.json index 178f1ed81..ae40b12e4 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_gear.json +++ b/src/generated/resources/data/basemetals/recipes/brass_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_gear" + "id": "basemetals:brass_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_gear_recycling.json index e63fde8a0..c6e06c075 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_gear" }, "result": { - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_helmet.json b/src/generated/resources/data/basemetals/recipes/brass_helmet.json index 62a930f6b..c415bba71 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/brass_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:brass_helmet" + "id": "basemetals:brass_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_helmet_recycling.json index 344486b28..5c4d1e030 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_hoe.json b/src/generated/resources/data/basemetals/recipes/brass_hoe.json index dfa5ab7c8..4be1aaef6 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:brass_hoe" + "id": "basemetals:brass_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_hoe_recycling.json index 5f164ad6e..5a49e590b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json b/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json index 6028f2a16..03fa4f8b2 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:brass_horse_armor" + "id": "basemetals:brass_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/brass_ingot_crushing.json index d773e7c5a..3c14ee56a 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/brass_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/brass" }, "result": { - "item": "basemetals:brass_powder" + "id": "basemetals:brass_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json index f258598f1..5ae90f6c3 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_leggings.json b/src/generated/resources/data/basemetals/recipes/brass_leggings.json index bbe1000c4..04c6e120e 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/brass_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:brass_leggings" + "id": "basemetals:brass_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_leggings_recycling.json index ec2408f88..a8597ec96 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_lever.json b/src/generated/resources/data/basemetals/recipes/brass_lever.json index cdd72b369..aa6eb407b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_lever.json +++ b/src/generated/resources/data/basemetals/recipes/brass_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:brass_lever" + "id": "basemetals:brass_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_lever_recycling.json index b5891a24c..da90278b7 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_lever" }, "result": { - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/brass_nugget_crushing.json index 1bc9cdf4f..cc414d017 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/brass_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/brass" }, "result": { - "item": "basemetals:brass_smallpowder" + "id": "basemetals:brass_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_nuggets.json b/src/generated/resources/data/basemetals/recipes/brass_nuggets.json index 71a827201..383a0a9e2 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/brass_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json b/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json index 8c0494545..973e70b52 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:brass_pickaxe" + "id": "basemetals:brass_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_pickaxe_recycling.json index dad91ba9d..5a847daf4 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_plate.json b/src/generated/resources/data/basemetals/recipes/brass_plate.json index a6b502086..f419afa18 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_plate.json +++ b/src/generated/resources/data/basemetals/recipes/brass_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:brass_plate" + "id": "basemetals:brass_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_plate_recycling.json index c56b490dd..b7d68b5da 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_plate" }, "result": { - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json index 6f79f6c5c..30f463c03 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:brass_powder" + "id": "basemetals:brass_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/brass_powder_smelting.json index d57928500..9c8b26eb5 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/brass_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/brass" }, - "result": "basemetals:brass_ingot" + "result": { + "id": "basemetals:brass_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json index 9782a113a..ae91445af 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:brass_pressure_plate" + "id": "basemetals:brass_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_pressure_plate_recycling.json index 8312b60ee..5d1184f07 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_rod.json b/src/generated/resources/data/basemetals/recipes/brass_rod.json index 6028863bb..06c3ac2ad 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_rod.json +++ b/src/generated/resources/data/basemetals/recipes/brass_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_rod" + "id": "basemetals:brass_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_rod_recycling.json index 8e8ebcc7a..0450b1669 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_scythe.json b/src/generated/resources/data/basemetals/recipes/brass_scythe.json index f779eed84..78ebafdb8 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:brass_scythe" + "id": "basemetals:brass_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_shears.json b/src/generated/resources/data/basemetals/recipes/brass_shears.json index 91fb0aff5..ce6cc171b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shears.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:brass_shears" + "id": "basemetals:brass_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_shears_recycling.json index 3653c79ee..1282a9adc 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_shield.json b/src/generated/resources/data/basemetals/recipes/brass_shield.json index 6a265f405..98915f667 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shield.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:brass_shield" + "id": "basemetals:brass_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_shovel.json b/src/generated/resources/data/basemetals/recipes/brass_shovel.json index 91367eed9..218f80a1a 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:brass_shovel" + "id": "basemetals:brass_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_shovel_recycling.json index f6b27125a..63863f116 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_shovel" }, "result": { - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_slab.json b/src/generated/resources/data/basemetals/recipes/brass_slab.json index 54fd8b835..47744cb82 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_slab.json +++ b/src/generated/resources/data/basemetals/recipes/brass_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:brass_slab" + "id": "basemetals:brass_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_slab_recycling.json index 404b5f5d7..56964840c 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:brass_nugget" + "id": "basemetals:brass_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallblend.json b/src/generated/resources/data/basemetals/recipes/brass_smallblend.json index 5bef85f99..82d6cdf53 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/brass_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:brass_smallblend" + "id": "basemetals:brass_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/brass_smallblend_smelting.json index 2797d4e36..e878d2aff 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/brass_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/brass" }, - "result": "basemetals:brass_nugget" + "result": { + "id": "basemetals:brass_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json b/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json index 8a527847e..66e666c3d 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:brass_smallpowder" + "id": "basemetals:brass_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/brass_smallpowder_smelting.json index 288bed5df..220267232 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/brass_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/brass" }, - "result": "basemetals:brass_nugget" + "result": { + "id": "basemetals:brass_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_stairs.json b/src/generated/resources/data/basemetals/recipes/brass_stairs.json index 1cbad91c4..00da14c1a 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/brass_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:brass_stairs" + "id": "basemetals:brass_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_sword.json b/src/generated/resources/data/basemetals/recipes/brass_sword.json index d5bd1c8ac..35067e4e8 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_sword.json +++ b/src/generated/resources/data/basemetals/recipes/brass_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:brass_sword" + "id": "basemetals:brass_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_sword_recycling.json index 642542195..a6955b369 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json b/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json index c5e30a93b..2152302d7 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:brass_trapdoor" + "id": "basemetals:brass_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_trapdoor_recycling.json index 916eb7bc3..26ae0ad1a 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:brass_ingot" + "id": "basemetals:brass_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_wall.json b/src/generated/resources/data/basemetals/recipes/brass_wall.json index b921d7c8d..820ffb4ac 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_wall.json +++ b/src/generated/resources/data/basemetals/recipes/brass_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:brass_wall" + "id": "basemetals:brass_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/brass_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/brass_wall_recycling.json index 431dffabe..d74771381 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/brass_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:brass_wall" }, "result": { - "item": "basemetals:brass_block" + "id": "basemetals:brass_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_arrow.json b/src/generated/resources/data/basemetals/recipes/bronze_arrow.json index ee8e4e36c..4a100ce9b 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_arrow" + "id": "basemetals:bronze_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_arrow_recycling.json index 842010825..23c5a6b56 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_arrow" }, "result": { - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_axe.json b/src/generated/resources/data/basemetals/recipes/bronze_axe.json index 1f66cd2d0..c1b48c72f 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_axe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:bronze_axe" + "id": "basemetals:bronze_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_axe_recycling.json index f0c881a73..fa5810b53 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars.json b/src/generated/resources/data/basemetals/recipes/bronze_bars.json index 684d739f7..287472b85 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bars.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:bronze_bars" + "id": "basemetals:bronze_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json b/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json index fe22cd826..06be99644 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_bars" + "id": "basemetals:bronze_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_bars_recycling.json index d04843ffd..723eb0b62 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend.json b/src/generated/resources/data/basemetals/recipes/bronze_blend.json index 0c537c694..0b93d3e87 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_blend.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_blend.json @@ -20,7 +20,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_blend" + "id": "basemetals:bronze_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json index 42b4b6dc0..347ae6ea3 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bronze_blend" + "id": "basemetals:bronze_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/bronze_blend_smelting.json index a8a24312e..90346d15f 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/bronze" }, - "result": "basemetals:bronze_ingot" + "result": { + "id": "basemetals:bronze_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block.json b/src/generated/resources/data/basemetals/recipes/bronze_block.json index 1628af160..99fba0f4b 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_block.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bronze_block" + "id": "basemetals:bronze_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block_crushing.json b/src/generated/resources/data/basemetals/recipes/bronze_block_crushing.json index 7b247e637..0fe5540f7 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:bronze_powder" + "id": "basemetals:bronze_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json b/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json index a392ce0ce..2699abec4 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bolt.json b/src/generated/resources/data/basemetals/recipes/bronze_bolt.json index 8e955d778..7e795d97f 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_bolt" + "id": "basemetals:bronze_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_bolt_recycling.json index cd6f4eb19..625d326e0 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_boots.json b/src/generated/resources/data/basemetals/recipes/bronze_boots.json index c140df251..f7674f6e2 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_boots.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:bronze_boots" + "id": "basemetals:bronze_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_boots_recycling.json index 35a57ff2a..194bda484 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bow.json b/src/generated/resources/data/basemetals/recipes/bronze_bow.json index 1db7d1d8f..162227910 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bow.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:bronze_bow" + "id": "basemetals:bronze_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_bow_recycling.json index b0d4285df..a1e0a5308 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_bow" }, "result": { - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_button.json b/src/generated/resources/data/basemetals/recipes/bronze_button.json index b39d6338d..214e39d75 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_button.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:bronze_button" + "id": "basemetals:bronze_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_button_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_button_recycling.json index 2fcee7f1a..74f16cc8c 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json b/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json index 0f50a2994..8dfc67042 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bronze_chestplate" + "id": "basemetals:bronze_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_chestplate_recycling.json index 8abfa07f7..6e2e94742 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json b/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json index a82576024..79a4da339 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:bronze_crackhammer" + "id": "basemetals:bronze_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_crackhammer_recycling.json index cb873b6aa..ab86a74db 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_crackhammer" }, "result": { - "item": "basemetals:bronze_block" + "id": "basemetals:bronze_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json b/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json index b437c26e6..0c4cc175e 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:bronze_crossbow" + "id": "basemetals:bronze_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_crossbow_recycling.json index 08e628764..e5cf4d65c 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_door.json b/src/generated/resources/data/basemetals/recipes/bronze_door.json index 30d874632..7d5ac0ce9 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_door.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:bronze_door" + "id": "basemetals:bronze_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_door_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_door_recycling.json index 4026337f8..e7e25a3db 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json b/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json index 08fdf339b..a2e93b6fa 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:bronze_fishing_rod" + "id": "basemetals:bronze_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_gear.json b/src/generated/resources/data/basemetals/recipes/bronze_gear.json index 945d5d96d..8eca2a907 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_gear.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_gear" + "id": "basemetals:bronze_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_gear_recycling.json index 8631399b2..ad3f464e4 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_gear" }, "result": { - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_helmet.json b/src/generated/resources/data/basemetals/recipes/bronze_helmet.json index ffd81b8be..82b1573b3 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:bronze_helmet" + "id": "basemetals:bronze_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_helmet_recycling.json index 87202705d..d80fc6ebc 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_hoe.json b/src/generated/resources/data/basemetals/recipes/bronze_hoe.json index 127247045..321dc7195 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:bronze_hoe" + "id": "basemetals:bronze_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_hoe_recycling.json index c2e270e21..62a583168 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json b/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json index 63ba49582..793ddfd8c 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:bronze_horse_armor" + "id": "basemetals:bronze_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/bronze_ingot_crushing.json index f3a1a4bdd..95c973fab 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/bronze" }, "result": { - "item": "basemetals:bronze_powder" + "id": "basemetals:bronze_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json index ed6fb8e5f..78f3d7f95 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_leggings.json b/src/generated/resources/data/basemetals/recipes/bronze_leggings.json index 6b411e98a..79d63bfe6 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:bronze_leggings" + "id": "basemetals:bronze_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_leggings_recycling.json index 129e48f19..a4d585d22 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_lever.json b/src/generated/resources/data/basemetals/recipes/bronze_lever.json index 5ae0cdde6..c9d815b14 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_lever.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:bronze_lever" + "id": "basemetals:bronze_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_lever_recycling.json index 175bf57da..bf6405d29 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_lever" }, "result": { - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/bronze_nugget_crushing.json index b5ac7dc31..c39b5bf2a 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/bronze" }, "result": { - "item": "basemetals:bronze_smallpowder" + "id": "basemetals:bronze_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json b/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json index b1adae8bc..c8494ce8f 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json b/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json index 225fda09d..ecb90b2a1 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:bronze_pickaxe" + "id": "basemetals:bronze_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_pickaxe_recycling.json index 4534beb74..cf9014e0d 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_plate.json b/src/generated/resources/data/basemetals/recipes/bronze_plate.json index ee9f18b9a..d671d93af 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:bronze_plate" + "id": "basemetals:bronze_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_plate_recycling.json index d89ab0110..d753b3b51 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_plate" }, "result": { - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json index c0a69474e..967188a51 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:bronze_powder" + "id": "basemetals:bronze_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/bronze_powder_smelting.json index f0acf168e..5a28ae23c 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/bronze" }, - "result": "basemetals:bronze_ingot" + "result": { + "id": "basemetals:bronze_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json index 84eb04b67..2f5a3a66a 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:bronze_pressure_plate" + "id": "basemetals:bronze_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate_recycling.json index 3938fde68..c46ded133 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_rod.json b/src/generated/resources/data/basemetals/recipes/bronze_rod.json index 3a54fb583..f4e2b7e1c 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_rod.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_rod" + "id": "basemetals:bronze_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_rod_recycling.json index 9ee8bdde5..fb4bd1bea 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_scythe.json b/src/generated/resources/data/basemetals/recipes/bronze_scythe.json index 1ec60787b..3ae17eb75 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:bronze_scythe" + "id": "basemetals:bronze_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shears.json b/src/generated/resources/data/basemetals/recipes/bronze_shears.json index ffe601848..aefc85347 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shears.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:bronze_shears" + "id": "basemetals:bronze_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_shears_recycling.json index 57c7da89f..5674a6904 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shield.json b/src/generated/resources/data/basemetals/recipes/bronze_shield.json index 8a7716995..8cec29c90 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shield.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:bronze_shield" + "id": "basemetals:bronze_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shovel.json b/src/generated/resources/data/basemetals/recipes/bronze_shovel.json index ae9b96f69..c489a698b 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:bronze_shovel" + "id": "basemetals:bronze_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_shovel_recycling.json index 7ffec086f..82b420d4b 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_shovel" }, "result": { - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_slab.json b/src/generated/resources/data/basemetals/recipes/bronze_slab.json index 510d741e3..de99af7d8 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_slab.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:bronze_slab" + "id": "basemetals:bronze_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_slab_recycling.json index f9d84d349..fe2923555 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bronze_nugget" + "id": "basemetals:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json b/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json index 8f00de4c4..5f311a263 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bronze_smallblend" + "id": "basemetals:bronze_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/bronze_smallblend_smelting.json index 11ec6b0fc..cb274f40b 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/bronze" }, - "result": "basemetals:bronze_nugget" + "result": { + "id": "basemetals:bronze_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json b/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json index 56ee8188e..5c746b512 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:bronze_smallpowder" + "id": "basemetals:bronze_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/bronze_smallpowder_smelting.json index eddb93949..0644e915d 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/bronze" }, - "result": "basemetals:bronze_nugget" + "result": { + "id": "basemetals:bronze_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_stairs.json b/src/generated/resources/data/basemetals/recipes/bronze_stairs.json index 12361452a..7c32bf1cb 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:bronze_stairs" + "id": "basemetals:bronze_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_sword.json b/src/generated/resources/data/basemetals/recipes/bronze_sword.json index 67a1d1328..9fe0e49f4 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_sword.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:bronze_sword" + "id": "basemetals:bronze_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_sword_recycling.json index e4a1c6baf..f47dfe4e0 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json b/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json index 79d324b8b..84c783d04 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:bronze_trapdoor" + "id": "basemetals:bronze_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_trapdoor_recycling.json index 05f7a2508..8a9d32bb1 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:bronze_ingot" + "id": "basemetals:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_wall.json b/src/generated/resources/data/basemetals/recipes/bronze_wall.json index b6ed73d1e..fc5dd7dfa 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_wall.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:bronze_wall" + "id": "basemetals:bronze_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/bronze_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/bronze_wall_recycling.json index eaf80f8e4..b472e5605 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:bronze_wall" }, "result": { - "item": "basemetals:bronze_block" + "id": "basemetals:bronze_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block.json b/src/generated/resources/data/basemetals/recipes/charcoal_block.json index f0a92a287..76baca0db 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_block.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:charcoal_block" + "id": "basemetals:charcoal_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block_crushing.json b/src/generated/resources/data/basemetals/recipes/charcoal_block_crushing.json index 940e15f3c..dfe7f7673 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:charcoal_powder" + "id": "basemetals:charcoal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json b/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json index 751067c92..61a9c4efe 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:charcoal_block" + "id": "basemetals:charcoal_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_crushing.json b/src/generated/resources/data/basemetals/recipes/charcoal_crushing.json index d10c60b8a..07efc3e51 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:charcoal" }, "result": { - "item": "basemetals:charcoal_powder" + "id": "basemetals:charcoal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json b/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json index 01ad936cf..1194e0b37 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "minecraft:charcoal" + "id": "minecraft:charcoal" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json b/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json index a0471251d..d2591fc19 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:charcoal_nugget" + "id": "basemetals:charcoal_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/charcoal_nugget_crushing.json index 89ac83209..823ff73d7 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/charcoal" }, "result": { - "item": "basemetals:charcoal_smallpowder" + "id": "basemetals:charcoal_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json index c8d374b20..dd5085b22 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:charcoal_powder" + "id": "basemetals:charcoal_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json index 473be8cff..98c4fb661 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:charcoal_smallpowder" + "id": "basemetals:charcoal_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_block_crushing.json b/src/generated/resources/data/basemetals/recipes/coal_block_crushing.json index d0f583444..f1b52942b 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coal_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:coal_powder" + "id": "basemetals:coal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_block_dust.json b/src/generated/resources/data/basemetals/recipes/coal_block_dust.json index dd63e5b49..c059bf33b 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_block_dust.json +++ b/src/generated/resources/data/basemetals/recipes/coal_block_dust.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "minecraft:coal_block" + "id": "minecraft:coal_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_crushing.json b/src/generated/resources/data/basemetals/recipes/coal_crushing.json index aef5fe90e..b0bfcec91 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coal_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:coal" }, "result": { - "item": "basemetals:coal_powder" + "id": "basemetals:coal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_ingot.json b/src/generated/resources/data/basemetals/recipes/coal_ingot.json index 979f60beb..cde7eb75f 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/coal_ingot.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "minecraft:coal" + "id": "minecraft:coal" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_nugget.json b/src/generated/resources/data/basemetals/recipes/coal_nugget.json index ad7766e1f..b130b83aa 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/coal_nugget.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:coal_nugget" + "id": "basemetals:coal_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/coal_nugget_crushing.json index 0bd4303a8..5ab20ec84 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coal_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/coal" }, "result": { - "item": "basemetals:coal_smallpowder" + "id": "basemetals:coal_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/coal_ore_crushing.json index c97dbcd64..e8cf88eed 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coal_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:coal_powder" + "id": "basemetals:coal_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json index 34ebcd43c..f70b9a196 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:coal_powder" + "id": "basemetals:coal_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json b/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json index bf49e8812..54ad71c0d 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:coal_smallpowder" + "id": "basemetals:coal_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipes/cobblestone_crushing.json index 45c03029a..62081597d 100644 --- a/src/generated/resources/data/basemetals/recipes/cobblestone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/cobblestone_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:cobblestone" }, "result": { - "item": "minecraft:gravel" + "id": "minecraft:gravel" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipes/cobblestone_wall_crushing.json index 41cbc882d..b006f3e6f 100644 --- a/src/generated/resources/data/basemetals/recipes/cobblestone_wall_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/cobblestone_wall_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:cobblestone_wall" }, "result": { - "item": "minecraft:gravel" + "id": "minecraft:gravel" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json b/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json index d5750e9c9..bab594a4a 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:coldiron_arrow" + "id": "basemetals:coldiron_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_arrow_recycling.json index d641be3be..dae8a9bff 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_arrow" }, "result": { - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_axe.json b/src/generated/resources/data/basemetals/recipes/coldiron_axe.json index eed5292a4..5e929dca4 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_axe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:coldiron_axe" + "id": "basemetals:coldiron_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_axe_recycling.json index 3ad16e5b6..37c4cb519 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars.json b/src/generated/resources/data/basemetals/recipes/coldiron_bars.json index 05f221880..dd686655c 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bars.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:coldiron_bars" + "id": "basemetals:coldiron_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json b/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json index c2f2fb28c..3fb1960b5 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:coldiron_bars" + "id": "basemetals:coldiron_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_bars_recycling.json index f50e4cb10..f91e1b2e0 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block.json b/src/generated/resources/data/basemetals/recipes/coldiron_block.json index 12ab4fc71..b533b60f3 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_block.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:coldiron_block" + "id": "basemetals:coldiron_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block_crushing.json b/src/generated/resources/data/basemetals/recipes/coldiron_block_crushing.json index 1746dd058..863b9c703 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:coldiron_powder" + "id": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json index 9cef9b99b..9a3e779d4 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json b/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json index 56bfada53..ef65cb408 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:coldiron_bolt" + "id": "basemetals:coldiron_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_bolt_recycling.json index e7fa50398..3283fa40c 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_boots.json b/src/generated/resources/data/basemetals/recipes/coldiron_boots.json index 350c17022..b542aaffa 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_boots.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:coldiron_boots" + "id": "basemetals:coldiron_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_boots_recycling.json index f7cfef83e..3058d1b8b 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bow.json b/src/generated/resources/data/basemetals/recipes/coldiron_bow.json index 23d173665..1bf7d2967 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bow.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:coldiron_bow" + "id": "basemetals:coldiron_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_bow_recycling.json index a69a2ad8c..cc23b15d1 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_bow" }, "result": { - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_button.json b/src/generated/resources/data/basemetals/recipes/coldiron_button.json index 85af869c7..e55e52757 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_button.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:coldiron_button" + "id": "basemetals:coldiron_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_button_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_button_recycling.json index 46ac41421..f033f01f3 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json b/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json index 231fa0df4..fd061ca5f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:coldiron_chestplate" + "id": "basemetals:coldiron_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_chestplate_recycling.json index 66dea4c94..d37a9f74b 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json index 2dd6dc78f..73b924860 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:coldiron_crackhammer" + "id": "basemetals:coldiron_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer_recycling.json index 2ffe868d2..7d20df8ba 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_crackhammer" }, "result": { - "item": "basemetals:coldiron_block" + "id": "basemetals:coldiron_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json b/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json index 2cf5fded9..f966eedf0 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:coldiron_crossbow" + "id": "basemetals:coldiron_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_crossbow_recycling.json index 58c4942d4..1bb5d98ab 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_door.json b/src/generated/resources/data/basemetals/recipes/coldiron_door.json index d93eccc6e..48b2663d4 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_door.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:coldiron_door" + "id": "basemetals:coldiron_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_door_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_door_recycling.json index 2339739e3..64bce29c1 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json index f074837e0..3e863c349 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:coldiron_fishing_rod" + "id": "basemetals:coldiron_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_gear.json b/src/generated/resources/data/basemetals/recipes/coldiron_gear.json index f7e575c56..b8085e6fd 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_gear.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:coldiron_gear" + "id": "basemetals:coldiron_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_gear_recycling.json index 9f47b52b1..396fa2504 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_gear" }, "result": { - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json b/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json index 8937ae04f..07ac2530d 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:coldiron_helmet" + "id": "basemetals:coldiron_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_helmet_recycling.json index a3e64de85..9aad0f84f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json b/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json index 4d8c80687..d538ea550 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:coldiron_hoe" + "id": "basemetals:coldiron_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_hoe_recycling.json index 2a107b840..453039bf7 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json index b20a33c1e..66cf54308 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:coldiron_horse_armor" + "id": "basemetals:coldiron_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/coldiron_ingot_crushing.json index f73d347e9..f775cd9dd 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/coldiron" }, "result": { - "item": "basemetals:coldiron_powder" + "id": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json index bcf12d6c6..4e215f967 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json b/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json index 52fbc3982..f14147c10 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:coldiron_leggings" + "id": "basemetals:coldiron_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_leggings_recycling.json index 031a0d6e1..7a70db595 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_lever.json b/src/generated/resources/data/basemetals/recipes/coldiron_lever.json index 99f31f84d..a33396a6b 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_lever.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:coldiron_lever" + "id": "basemetals:coldiron_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_lever_recycling.json index d14cabe8c..943b749a6 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_lever" }, "result": { - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/coldiron_nugget_crushing.json index 1cfbfea4e..2e19154dd 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/coldiron" }, "result": { - "item": "basemetals:coldiron_smallpowder" + "id": "basemetals:coldiron_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json b/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json index b8cbf1f2f..d55491a03 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/coldiron_ore_blasting.json index 49238ae1f..40029c2cd 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/coldiron" }, - "result": "basemetals:coldiron_ingot" + "result": { + "id": "basemetals:coldiron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/coldiron_ore_crushing.json index 8b3f2b6c0..273d574d0 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_powder" + "id": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/coldiron_ore_smelting.json index dbdb86183..ad710a42d 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/coldiron" }, - "result": "basemetals:coldiron_ingot" + "result": { + "id": "basemetals:coldiron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json index 40c720997..ab4a2ece6 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:coldiron_pickaxe" + "id": "basemetals:coldiron_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe_recycling.json index e152a20e8..2fcc0900f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_plate.json b/src/generated/resources/data/basemetals/recipes/coldiron_plate.json index 633038e9e..501361547 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_plate.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:coldiron_plate" + "id": "basemetals:coldiron_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_plate_recycling.json index e06606b04..6680352ef 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_plate" }, "result": { - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json index 04e714a5d..1dba1b3f3 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:coldiron_powder" + "id": "basemetals:coldiron_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/coldiron_powder_smelting.json index 92c2f87a1..ff79e1486 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/coldiron" }, - "result": "basemetals:coldiron_ingot" + "result": { + "id": "basemetals:coldiron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json index 9ca9c5876..062d0f267 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:coldiron_pressure_plate" + "id": "basemetals:coldiron_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate_recycling.json index 87c95e232..fd9e1b40e 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/coldiron_raw_blasting.json index 83634ad7f..b1d296c2d 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/coldiron" }, - "result": "basemetals:coldiron_ingot" + "result": { + "id": "basemetals:coldiron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/coldiron_raw_crushing.json index 9890abf91..020d681cd 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/coldiron" }, "result": { - "item": "basemetals:coldiron_powder" + "id": "basemetals:coldiron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/coldiron_raw_smelting.json index d954ae6e9..c5677453a 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/coldiron" }, - "result": "basemetals:coldiron_ingot" + "result": { + "id": "basemetals:coldiron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_rod.json b/src/generated/resources/data/basemetals/recipes/coldiron_rod.json index 714af67ec..aaa33f5ec 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_rod.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:coldiron_rod" + "id": "basemetals:coldiron_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_rod_recycling.json index ff90b0753..2de2f3a43 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json b/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json index 4e5fcb81b..a7a8471a1 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:coldiron_scythe" + "id": "basemetals:coldiron_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shears.json b/src/generated/resources/data/basemetals/recipes/coldiron_shears.json index 67714d15e..13a0fe1be 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shears.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:coldiron_shears" + "id": "basemetals:coldiron_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_shears_recycling.json index e3bbe8300..a8cc06c57 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shield.json b/src/generated/resources/data/basemetals/recipes/coldiron_shield.json index 595a21985..5258d5381 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shield.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:coldiron_shield" + "id": "basemetals:coldiron_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json b/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json index 4ae8dc377..3d67acb0a 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:coldiron_shovel" + "id": "basemetals:coldiron_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_shovel_recycling.json index 6d29b98f7..0917fae8b 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_shovel" }, "result": { - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_slab.json b/src/generated/resources/data/basemetals/recipes/coldiron_slab.json index 784261b35..8ff8db78e 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_slab.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:coldiron_slab" + "id": "basemetals:coldiron_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_slab_recycling.json index a5fafdb5a..ddabc136f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:coldiron_nugget" + "id": "basemetals:coldiron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json index 606f3749a..cf68a88fc 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:coldiron_smallpowder" + "id": "basemetals:coldiron_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder_smelting.json index 44bf0b2d4..a036c0507 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/coldiron" }, - "result": "basemetals:coldiron_nugget" + "result": { + "id": "basemetals:coldiron_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json b/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json index 84e5249b3..b98686f60 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:coldiron_stairs" + "id": "basemetals:coldiron_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_sword.json b/src/generated/resources/data/basemetals/recipes/coldiron_sword.json index ea4258e1c..b3ad4aca1 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_sword.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:coldiron_sword" + "id": "basemetals:coldiron_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_sword_recycling.json index 24da30def..1995f6a53 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json index b40d4fa87..68adabc63 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:coldiron_trapdoor" + "id": "basemetals:coldiron_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor_recycling.json index f0847a85a..ef472a12b 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:coldiron_ingot" + "id": "basemetals:coldiron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_wall.json b/src/generated/resources/data/basemetals/recipes/coldiron_wall.json index 735646626..385aa64f3 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_wall.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:coldiron_wall" + "id": "basemetals:coldiron_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/coldiron_wall_recycling.json index 0a22ff444..81941981a 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:coldiron_wall" }, "result": { - "item": "basemetals:coldiron_block" + "id": "basemetals:coldiron_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ingot_sag_milling.json index 362af6ac8..3e155432e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "input": { "tag": "forge:ingots/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ore_sag_milling.json index 4ba291339..a87db6c68 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/adamantine/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "input": { "tag": "forge:ores/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/aquarium.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/aquarium.json index 84a5c2d6e..4ae3cc33d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/aquarium.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/aquarium.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } + ] + }, "inputs": [ { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/brass.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/brass.json index 8ce3f1cb9..d7728247b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/brass.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/brass.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } + ] + }, "inputs": [ { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/bronze.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/bronze.json index 21ea2ced0..d29e26517 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/bronze.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/bronze.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } + ] + }, "inputs": [ { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/cupronickel.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/cupronickel.json index e04885375..2fb43335c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/cupronickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/cupronickel.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_ingot" + } + ] + }, "inputs": [ { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/electrum.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/electrum.json index f40a1778e..8c83dbc17 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/electrum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/electrum.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } + ] + }, "inputs": [ { "count": 1, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/invar.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/invar.json index da8fb8664..9ea4671ed 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/invar.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/invar.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } + ] + }, "inputs": [ { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/mithril.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/mithril.json index 5a9db2911..1fc127924 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/mithril.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/mithril.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } + ] + }, "inputs": [ { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/pewter.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/pewter.json index cf3c3cdee..dae8614b1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/pewter.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/pewter.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_ingot" + } + ] + }, "inputs": [ { "count": 1, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/steel.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/steel.json index b5de5143c..664b1062a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/steel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/alloys/steel.json @@ -1,17 +1,20 @@ { "type": "enderio:alloy_smelting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_ingot" - } - ], "energy": 6400, "experience": 0.3, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } + ] + }, "inputs": [ { "count": 8, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ingot_sag_milling.json index 9fc06f2e4..dbc7f47f1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "input": { "tag": "forge:ingots/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ore_sag_milling.json index 82cffae71..6ddea01d5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/antimony/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "input": { "tag": "forge:ores/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/aquarium/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/aquarium/ingot_sag_milling.json index cf65fc68e..a3abae02a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/aquarium/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/aquarium/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_powder" + } + ] + }, "input": { "tag": "forge:ingots/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ingot_sag_milling.json index c586be490..c1192be5b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "input": { "tag": "forge:ingots/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ore_sag_milling.json index d2fab668b..e08df6376 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/bismuth/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "input": { "tag": "forge:ores/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/brass/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/brass/ingot_sag_milling.json index 764e011be..3cedaf659 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/brass/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/brass/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_powder" + } + ] + }, "input": { "tag": "forge:ingots/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/bronze/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/bronze/ingot_sag_milling.json index 4ab0a8d83..710fc9ab5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/bronze/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/bronze/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_powder" + } + ] + }, "input": { "tag": "forge:ingots/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ingot_sag_milling.json index 8e9e18fb2..7d3cd8c9d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "input": { "tag": "forge:ingots/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ore_sag_milling.json index a838c34f0..eb87b6e36 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/coldiron/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "input": { "tag": "forge:ores/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ingot_sag_milling.json index ea5982026..5f679ffa1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_powder" + } + ] + }, "input": { "tag": "forge:ingots/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ore_sag_milling.json index 22aa4df8f..fc9d254f8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/copper/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_powder" + } + ] + }, "input": { "tag": "forge:ores/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/cupronickel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/cupronickel/ingot_sag_milling.json index 60d53542f..4ff117b97 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/cupronickel/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/cupronickel/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_powder" + } + ] + }, "input": { "tag": "forge:ingots/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/electrum/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/electrum/ingot_sag_milling.json index 4a2905f23..083f13e54 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/electrum/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/electrum/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_powder" + } + ] + }, "input": { "tag": "forge:ingots/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/invar/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/invar/ingot_sag_milling.json index ffd2b05d7..76bd757bb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/invar/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/invar/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_powder" + } + ] + }, "input": { "tag": "forge:ingots/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ingot_sag_milling.json index ccad6ee2b..13ce51cf7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_powder" + } + ] + }, "input": { "tag": "forge:ingots/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ore_sag_milling.json index 92080b2fd..52bd7417a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/lead/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_powder" + } + ] + }, "input": { "tag": "forge:ores/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ingot_sag_milling.json index 09a7a096b..0bfce613d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mercury_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mercury_powder" + } + ] + }, "input": { "tag": "forge:ingots/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ore_sag_milling.json index 8be452fbb..06c1ce834 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/mercury/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mercury_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mercury_powder" + } + ] + }, "input": { "tag": "forge:ores/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/mithril/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/mithril/ingot_sag_milling.json index 24551333e..c6554cab0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/mithril/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/mithril/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_powder" + } + ] + }, "input": { "tag": "forge:ingots/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ingot_sag_milling.json index 48690c7b9..b807cc93d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "input": { "tag": "forge:ingots/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ore_sag_milling.json index 6c6bb77e1..47368ef03 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/nickel/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "input": { "tag": "forge:ores/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/pewter/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/pewter/ingot_sag_milling.json index ad8f8acae..f7af1bf55 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/pewter/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/pewter/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_powder" + } + ] + }, "input": { "tag": "forge:ingots/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ingot_sag_milling.json index a76c0a528..7ca8d0517 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "input": { "tag": "forge:ingots/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ore_sag_milling.json index 496814b16..ac0910e20 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/platinum/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "input": { "tag": "forge:ores/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ingot_sag_milling.json index 6f8e8ab1e..a18c658f0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_powder" + } + ] + }, "input": { "tag": "forge:ingots/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ore_sag_milling.json index cb71646e7..dbbe8e9b5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/silver/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_powder" + } + ] + }, "input": { "tag": "forge:ores/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ingot_sag_milling.json index 42aac3f4e..16258b36f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "input": { "tag": "forge:ingots/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ore_sag_milling.json index 8b7680149..266842112 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/starsteel/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "input": { "tag": "forge:ores/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/steel/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/steel/ingot_sag_milling.json index 6eece306e..10bd080da 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/steel/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/steel/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_powder" + } + ] + }, "input": { "tag": "forge:ingots/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ingot_sag_milling.json index 252740879..da01af645 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_powder" + } + ] + }, "input": { "tag": "forge:ingots/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json index 7d99735dc..d67da3302 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/tin/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_powder" + } + ] + }, "input": { "tag": "forge:ores/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ingot_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ingot_sag_milling.json index 930ef4a5d..fbdf26337 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ingot_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ingot_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "input": { "tag": "forge:ingots/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ore_sag_milling.json b/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ore_sag_milling.json index b1c587609..d0b69f7ed 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ore_sag_milling.json +++ b/src/generated/resources/data/basemetals/recipes/compat/enderio/zinc/ore_sag_milling.json @@ -1,16 +1,19 @@ { "type": "enderio:sag_milling", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "enderio" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], "energy": 2400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "input": { "tag": "forge:ores/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clean_slurry_to_crystal.json index 9e5ac25d4..c06e16638 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clump_to_dirty_dust.json index 7c29ce6fa..e2adf3ed3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/crystal_to_shard.json index b426f9973..8ff248121 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_dust_to_dust.json index 6c4e2ba66..ff6e03eb8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json index 5f317150a..6f0f94ece 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ingot_to_dust.json index 8ce182075..84ae8e1bd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_clump.json index 3fbcec311..1cae412a0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dirty_slurry.json index 0ba167090..b8a9ef284 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dust.json index 37edccb95..185faff06 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_shard.json index 92665f2e7..2923869f1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/shard_to_clump.json index a3edb1256..54642f4ff 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/adamantine/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/adamantine" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clean_slurry_to_crystal.json index 74d1e6a6d..1a6b71476 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clump_to_dirty_dust.json index 3677b976c..6672e1e59 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/crystal_to_shard.json index dce7c8274..530869579 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_dust_to_dust.json index 77c8f1572..596b6c756 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json index d97e8043a..f82992950 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ingot_to_dust.json index 78cc16239..34e0a696a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_clump.json index 4ae8e55b5..980777a06 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dirty_slurry.json index c28d659d4..3f59ee875 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dust.json index b322d3190..0e67a2a12 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_shard.json index 6c6bacc81..f48a34577 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/shard_to_clump.json index dd35c726b..e7dc55c94 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/antimony/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/antimony" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clean_slurry_to_crystal.json index 374f16406..73c05de9e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clump_to_dirty_dust.json index 654abba78..d3d224062 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/crystal_to_shard.json index 94efc3f43..64cdbaa57 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_dust_to_dust.json index a9c0f5404..6c1db72c1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json index dacaa33c2..5525c6f37 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ingot_to_dust.json index e830763c0..1876aa2b3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_clump.json index d586b4c15..c18e70cee 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dirty_slurry.json index e7391001e..c9dce7a24 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dust.json index f56188906..5030e7f94 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_shard.json index cc294bc45..0e3e16475 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/shard_to_clump.json index 28e3b81d1..ca141d4c2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/bismuth/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/bismuth" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clean_slurry_to_crystal.json index 8a609863e..af0f85781 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clump_to_dirty_dust.json index 30192a2af..968b426a9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/crystal_to_shard.json index 239ecb1d9..addfadebc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_dust_to_dust.json index f16ddbc99..2b98da387 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json index 5052ddc32..e04e9aea8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ingot_to_dust.json index 2263b8e65..938a19c41 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_clump.json index 5fffe00f9..43de45a0b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dirty_slurry.json index 1667dba8a..db66865d4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dust.json index dc1e91760..15c20dfe4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_shard.json index 81f8fdebe..c69ea76c5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/shard_to_clump.json index 8c339079b..02db2038f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/coldiron/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/coldiron" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clean_slurry_to_crystal.json index d449ebc8a..007265067 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clump_to_dirty_dust.json index e470609af..4d9b65767 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/crystal_to_shard.json index c3c1da4cd..82b983b43 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_dust_to_dust.json index bb249ea57..992ccdca2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json index b43e35c36..af9200f78 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ingot_to_dust.json index 0884eb947..1e9479a70 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_clump.json index 79ef842db..9ed994baf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dirty_slurry.json index 7ad3856ad..deb37a140 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dust.json index 4f3334023..11393ff0a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_shard.json index 417e9decf..4b557c400 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/shard_to_clump.json index 1d58da0ee..e1a302633 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/nickel/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/nickel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clean_slurry_to_crystal.json index e4c8a1589..172bd4966 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clump_to_dirty_dust.json index 734549e76..4829faf70 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/crystal_to_shard.json index 81f8e82a6..17d876706 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_dust_to_dust.json index ba96255a5..541855b81 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json index 11b40d085..5d1f942bd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ingot_to_dust.json index 3e1fc671e..51052733b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_clump.json index 7fe8ce461..84b33a9c0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dirty_slurry.json index 1e4849e19..0390eeb77 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dust.json index 5532e8c26..88b43d7ab 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_shard.json index b146b45d1..062e74b3a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/shard_to_clump.json index 87f33e9d5..23e72a5d3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/platinum/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/platinum" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clean_slurry_to_crystal.json index 75447d49a..b61df2a86 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clump_to_dirty_dust.json index 3f892ad8b..7f881c3d4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/crystal_to_shard.json index e427769e6..ca1788053 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_dust_to_dust.json index 978a99acf..64f9c0232 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json index 6d2ba8734..ea4c434ce 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ingot_to_dust.json index 5fd4ccb20..0f3e02d60 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_clump.json index 35e55ef49..b0e9183de 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dirty_slurry.json index 70d8b8539..c36fd48c9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dust.json index 97ab8339f..60b85047a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_shard.json index 8715ef958..9d31bccd8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/shard_to_clump.json index 796348bba..1a4f96ab9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/starsteel/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/starsteel" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clean_slurry_to_crystal.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clean_slurry_to_crystal.json index 241c92235..6ed966c8c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clean_slurry_to_crystal.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clean_slurry_to_crystal.json @@ -1,16 +1,19 @@ { "type": "mekanism:crystallizing", "chemicalType": "slurry", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_crystal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_crystal" + } + ] + }, "input": { "amount": 200, "slurry": "basemetals:clean_zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clump_to_dirty_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clump_to_dirty_dust.json index f124bdede..940ba3a86 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clump_to_dirty_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/clump_to_dirty_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder_dirty" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder_dirty" + } + ] + }, "input": { "ingredient": { "tag": "forge:clumps/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/crystal_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/crystal_to_shard.json index 0068d5fdc..eac6e6dd0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/crystal_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/crystal_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:crystals/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_dust_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_dust_to_dust.json index fc7583e90..fcf42d624 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_dust_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_dust_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:dirty_dusts/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json index d99de89d8..32d36a242 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/dirty_slurry_to_clean_slurry.json @@ -1,15 +1,18 @@ { "type": "mekanism:washing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], "fluidInput": { "amount": 5, "tag": "minecraft:water" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "output": { "amount": 1, "slurry": "basemetals:clean_zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ingot_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ingot_to_dust.json index 769e2373d..e36bfb35b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ingot_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ingot_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:crushing", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ingots/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_clump.json index acfa98f22..63a9d9cf2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dirty_slurry.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dirty_slurry.json index 0a6b4367e..8c370392f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dirty_slurry.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dirty_slurry.json @@ -1,11 +1,14 @@ { "type": "mekanism:dissolution", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "gasInput": { "amount": 1, "gas": "mekanism:sulfuric_acid" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dust.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dust.json index f708debd6..fb5fe910d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dust.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_dust.json @@ -1,15 +1,18 @@ { "type": "mekanism:enriching", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "input": { "ingredient": { "tag": "forge:ores/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_shard.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_shard.json index 2e32ca607..77d0931a3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_shard.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/ore_to_shard.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:hydrogen_chloride" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_shard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_shard" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:ores/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/shard_to_clump.json b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/shard_to_clump.json index 0e9c37535..285e13658 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/shard_to_clump.json +++ b/src/generated/resources/data/basemetals/recipes/compat/mekanism/zinc/shard_to_clump.json @@ -4,16 +4,19 @@ "amount": 1, "gas": "mekanism:oxygen" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "mekanism" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_clump" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_clump" + } + ] + }, "itemInput": { "ingredient": { "tag": "forge:shards/zinc" diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/aquarium.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/aquarium.json index 85c3f5468..44e071808 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/aquarium.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/aquarium.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 180, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/brass.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/brass.json index cce979c8d..a87d4037f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/brass.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/brass.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 270, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/bronze.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/bronze.json index be62df143..ad7e2ad47 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/bronze.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/bronze.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 270, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/cupronickel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/cupronickel.json index c05cd8d08..6cfbf1371 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/cupronickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/cupronickel.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 270, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/electrum.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/electrum.json index b7d65e7b8..772925ab3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/electrum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/electrum.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/invar.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/invar.json index 5c28b6bcd..c29eb48c6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/invar.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/invar.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 180, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/mithril.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/mithril.json index 3d9d98f10..366ab6789 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/mithril.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/mithril.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 180, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/pewter.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/pewter.json index 67054d245..b1b194a44 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/pewter.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/alloys/pewter.json @@ -1,11 +1,14 @@ { "type": "tconstruct:alloy", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "inputs": [ { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/block.json index a213d6861..13899ad59 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_block" + } + ] + }, "result": { "item": "basemetals:adamantine_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_gold_cast.json index 362c5e4e2..d866368d6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_gear" + } + ] + }, "result": { "item": "basemetals:adamantine_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_sand_cast.json index 43d26de7d..80f3433bd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_gear" + } + ] + }, "result": { "item": "basemetals:adamantine_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_gold_cast.json index 0a2164204..b0f7ef68b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_ingot" + } + ] + }, "result": { "item": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_sand_cast.json index 72562d04c..73ce9910f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_ingot" + } + ] + }, "result": { "item": "basemetals:adamantine_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_gold_cast.json index 8722108ba..7774db0a7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_nugget" + } + ] + }, "result": { "item": "basemetals:adamantine_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_sand_cast.json index 2cb3ec7f2..b42e9e92f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_nugget" + } + ] + }, "result": { "item": "basemetals:adamantine_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_gold_cast.json index 95ef14144..bcff8928f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_plate" + } + ] + }, "result": { "item": "basemetals:adamantine_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_sand_cast.json index 80d218aab..6465566ee 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_plate" + } + ] + }, "result": { "item": "basemetals:adamantine_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_gold_cast.json index 74b8236bd..1a99a202d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_rod" + } + ] + }, "result": { "item": "basemetals:adamantine_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_sand_cast.json index ff07e2415..c77b49dc7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/adamantine/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_rod" + } + ] + }, "result": { "item": "basemetals:adamantine_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/block.json index 4270a4eb2..634d3eb36 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_block" + } + ] + }, "result": { "item": "basemetals:antimony_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_gold_cast.json index 950a2d1b1..3e24ada04 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_gear" + } + ] + }, "result": { "item": "basemetals:antimony_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_sand_cast.json index 159308139..509d00bef 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_gear" + } + ] + }, "result": { "item": "basemetals:antimony_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_gold_cast.json index fa0f3f497..b63282e02 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_ingot" + } + ] + }, "result": { "item": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_sand_cast.json index 2f561362f..d415a0792 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_ingot" + } + ] + }, "result": { "item": "basemetals:antimony_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_gold_cast.json index c4310d642..d105aca4a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_nugget" + } + ] + }, "result": { "item": "basemetals:antimony_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_sand_cast.json index 9e3037e17..4d411abcc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_nugget" + } + ] + }, "result": { "item": "basemetals:antimony_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_gold_cast.json index a662b3282..007651013 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_plate" + } + ] + }, "result": { "item": "basemetals:antimony_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_sand_cast.json index b02fe4531..70d799fcb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_plate" + } + ] + }, "result": { "item": "basemetals:antimony_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_gold_cast.json index 73b2d32fc..2b0dbb6c9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_rod" + } + ] + }, "result": { "item": "basemetals:antimony_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_sand_cast.json index 13b6b2c4c..304fb9930 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/antimony/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_rod" + } + ] + }, "result": { "item": "basemetals:antimony_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/block.json index cb7fbcd0d..e2b302f7c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_block" + } + ] + }, "result": { "item": "basemetals:aquarium_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_gold_cast.json index d8efc6aec..e8551b8cd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_gear" + } + ] + }, "result": { "item": "basemetals:aquarium_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_sand_cast.json index f585d735e..ddf3108b4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_gear" + } + ] + }, "result": { "item": "basemetals:aquarium_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_gold_cast.json index 40aeac63f..1c5b7b564 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } + ] + }, "result": { "item": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_sand_cast.json index b6d073c3f..f7488e4f3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } + ] + }, "result": { "item": "basemetals:aquarium_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_gold_cast.json index 623335fe9..3734366d3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_nugget" + } + ] + }, "result": { "item": "basemetals:aquarium_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_sand_cast.json index dc740af68..aa1cb61b3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_nugget" + } + ] + }, "result": { "item": "basemetals:aquarium_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_gold_cast.json index dcc8f9926..7e7e81f43 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_plate" + } + ] + }, "result": { "item": "basemetals:aquarium_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_sand_cast.json index 03745e6ba..95ac791a7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_plate" + } + ] + }, "result": { "item": "basemetals:aquarium_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_gold_cast.json index bff1550c4..23a8dc751 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_rod" + } + ] + }, "result": { "item": "basemetals:aquarium_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_sand_cast.json index 1ab898d79..b54c49917 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/aquarium/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_rod" + } + ] + }, "result": { "item": "basemetals:aquarium_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/block.json index 028444287..3b40f0171 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_block" + } + ] + }, "result": { "item": "basemetals:bismuth_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_gold_cast.json index 8509bb4b8..8fcc496af 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_gear" + } + ] + }, "result": { "item": "basemetals:bismuth_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_sand_cast.json index 0209e96e7..5c247dc70 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_gear" + } + ] + }, "result": { "item": "basemetals:bismuth_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_gold_cast.json index c7744eb45..cd3b94fa0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_ingot" + } + ] + }, "result": { "item": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_sand_cast.json index 739f0ad70..94bf033a4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_ingot" + } + ] + }, "result": { "item": "basemetals:bismuth_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_gold_cast.json index 2a6ab7130..e5913d075 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_nugget" + } + ] + }, "result": { "item": "basemetals:bismuth_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_sand_cast.json index aee47d47a..d68cf54eb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_nugget" + } + ] + }, "result": { "item": "basemetals:bismuth_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_gold_cast.json index 03283866d..560fea937 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_plate" + } + ] + }, "result": { "item": "basemetals:bismuth_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_sand_cast.json index beb6a7ea0..dfe01f2d6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_plate" + } + ] + }, "result": { "item": "basemetals:bismuth_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_gold_cast.json index b5eac47ea..6380df266 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_rod" + } + ] + }, "result": { "item": "basemetals:bismuth_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_sand_cast.json index b7fa52266..50f9072c2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bismuth/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_rod" + } + ] + }, "result": { "item": "basemetals:bismuth_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/block.json index fd48a6c2a..0c761e21f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_block" + } + ] + }, "result": { "item": "basemetals:brass_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_gold_cast.json index 5dc948705..babab0885 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_gear" + } + ] + }, "result": { "item": "basemetals:brass_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_sand_cast.json index fe8405ead..8e53006b3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_gear" + } + ] + }, "result": { "item": "basemetals:brass_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_gold_cast.json index 598bb5b89..45723eebc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } + ] + }, "result": { "item": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_sand_cast.json index a215b836e..274ec3650 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } + ] + }, "result": { "item": "basemetals:brass_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_gold_cast.json index 94214e83a..bf82087a9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_nugget" + } + ] + }, "result": { "item": "basemetals:brass_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_sand_cast.json index 9b015a45f..b528f4740 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_nugget" + } + ] + }, "result": { "item": "basemetals:brass_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_gold_cast.json index 743bb6800..e7135ca04 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_plate" + } + ] + }, "result": { "item": "basemetals:brass_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_sand_cast.json index b47e143db..8db9709cc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_plate" + } + ] + }, "result": { "item": "basemetals:brass_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_gold_cast.json index b2e43045e..a74810147 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_rod" + } + ] + }, "result": { "item": "basemetals:brass_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_sand_cast.json index 5225abe24..50b3e0010 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/brass/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_rod" + } + ] + }, "result": { "item": "basemetals:brass_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/block.json index 2e0788662..27c111514 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_block" + } + ] + }, "result": { "item": "basemetals:bronze_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_gold_cast.json index 42ce10ce7..b77be0a31 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_gear" + } + ] + }, "result": { "item": "basemetals:bronze_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_sand_cast.json index 52c109843..738572b1d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_gear" + } + ] + }, "result": { "item": "basemetals:bronze_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_gold_cast.json index 8eedf85b5..1d67ca712 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } + ] + }, "result": { "item": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_sand_cast.json index 7cbfb68a1..2a93c858e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } + ] + }, "result": { "item": "basemetals:bronze_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_gold_cast.json index 094ade528..4dd9e17c3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_nugget" + } + ] + }, "result": { "item": "basemetals:bronze_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_sand_cast.json index da943b5a5..aa541c1ca 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_nugget" + } + ] + }, "result": { "item": "basemetals:bronze_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_gold_cast.json index 9490ba34c..849906de2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_plate" + } + ] + }, "result": { "item": "basemetals:bronze_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_sand_cast.json index 402f07d2b..55f41e882 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_plate" + } + ] + }, "result": { "item": "basemetals:bronze_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_gold_cast.json index eb8774d2b..b7814d17c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_rod" + } + ] + }, "result": { "item": "basemetals:bronze_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_sand_cast.json index a3ecd68ae..65105f08f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/bronze/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_rod" + } + ] + }, "result": { "item": "basemetals:bronze_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/block.json index f296008e7..171e959a3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_block" + } + ] + }, "result": { "item": "basemetals:coldiron_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_gold_cast.json index beaf1c5eb..759d9aee5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_gear" + } + ] + }, "result": { "item": "basemetals:coldiron_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_sand_cast.json index b87250538..f16e148d8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_gear" + } + ] + }, "result": { "item": "basemetals:coldiron_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_gold_cast.json index 0e09f9367..94c2f6ece 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_ingot" + } + ] + }, "result": { "item": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_sand_cast.json index 42842ae34..17b786323 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_ingot" + } + ] + }, "result": { "item": "basemetals:coldiron_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_gold_cast.json index 1135dbea5..fc077130b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_nugget" + } + ] + }, "result": { "item": "basemetals:coldiron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_sand_cast.json index 58522fbf4..5b02e3685 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_nugget" + } + ] + }, "result": { "item": "basemetals:coldiron_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_gold_cast.json index 261669045..81bbe0a26 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_plate" + } + ] + }, "result": { "item": "basemetals:coldiron_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_sand_cast.json index 9d067dbe6..db2dc8aa8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_plate" + } + ] + }, "result": { "item": "basemetals:coldiron_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_gold_cast.json index 92cce4d93..28a764732 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_rod" + } + ] + }, "result": { "item": "basemetals:coldiron_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_sand_cast.json index e560d4ade..6c6decf3a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/coldiron/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_rod" + } + ] + }, "result": { "item": "basemetals:coldiron_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json index cbe20d58b..2364e66da 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_block" + } + ] + }, "result": { "item": "basemetals:copper_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_gold_cast.json index f015ae06e..4e5c37dc7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_gear" + } + ] + }, "result": { "item": "basemetals:copper_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_sand_cast.json index a62bb0378..38c8bc8cd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_gear" + } + ] + }, "result": { "item": "basemetals:copper_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json index cdd326efc..9612cb92d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_ingot" + } + ] + }, "result": { "item": "basemetals:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json index ac04c5e2f..18f91cae6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_ingot" + } + ] + }, "result": { "item": "basemetals:copper_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_gold_cast.json index 4cb367534..49662100c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_nugget" + } + ] + }, "result": { "item": "basemetals:copper_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_sand_cast.json index 3894731cb..bda7e767b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_nugget" + } + ] + }, "result": { "item": "basemetals:copper_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_gold_cast.json index 227940d8a..cf408b120 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_plate" + } + ] + }, "result": { "item": "basemetals:copper_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_sand_cast.json index 132da21b1..459799b69 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_plate" + } + ] + }, "result": { "item": "basemetals:copper_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_gold_cast.json index 778261175..0bc8d4ffd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_rod" + } + ] + }, "result": { "item": "basemetals:copper_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_sand_cast.json index 2bf4e7c98..c623c13df 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/copper/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_rod" + } + ] + }, "result": { "item": "basemetals:copper_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/block.json index 0ea4a01ca..54664dada 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_block" + } + ] + }, "result": { "item": "basemetals:cupronickel_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_gold_cast.json index b8b76d51d..e79b75d1b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_gear" + } + ] + }, "result": { "item": "basemetals:cupronickel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_sand_cast.json index 9c9799d6c..da9bac0f8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_gear" + } + ] + }, "result": { "item": "basemetals:cupronickel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json index f8b7872fb..5352af00c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_ingot" + } + ] + }, "result": { "item": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json index b3787c53c..468ebfa63 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_ingot" + } + ] + }, "result": { "item": "basemetals:cupronickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json index be646551a..c0e5533f4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_nugget" + } + ] + }, "result": { "item": "basemetals:cupronickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json index 9c2702a31..ccdffe999 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_nugget" + } + ] + }, "result": { "item": "basemetals:cupronickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_gold_cast.json index d04709fa0..6b4e48044 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_plate" + } + ] + }, "result": { "item": "basemetals:cupronickel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_sand_cast.json index 3eee31d6d..41990fbbd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_plate" + } + ] + }, "result": { "item": "basemetals:cupronickel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_gold_cast.json index c7460ff0c..0dc1efc6d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_rod" + } + ] + }, "result": { "item": "basemetals:cupronickel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_sand_cast.json index 0eec87432..d48bee281 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/cupronickel/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_rod" + } + ] + }, "result": { "item": "basemetals:cupronickel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/block.json index c88b325b6..58ee78b2c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_block" + } + ] + }, "result": { "item": "basemetals:electrum_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_gold_cast.json index a38b2cded..1a3ad751d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_gear" + } + ] + }, "result": { "item": "basemetals:electrum_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_sand_cast.json index a4bd62778..ce8da8a60 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_gear" + } + ] + }, "result": { "item": "basemetals:electrum_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_gold_cast.json index d789c654e..f1658d59e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } + ] + }, "result": { "item": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_sand_cast.json index 6beca8d1e..77f4220e5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } + ] + }, "result": { "item": "basemetals:electrum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_gold_cast.json index 01214849d..ed4307159 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_nugget" + } + ] + }, "result": { "item": "basemetals:electrum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_sand_cast.json index fa855afb9..55debccc9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_nugget" + } + ] + }, "result": { "item": "basemetals:electrum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_gold_cast.json index db38f1499..968702500 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_plate" + } + ] + }, "result": { "item": "basemetals:electrum_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_sand_cast.json index 052998229..6f6ea5979 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_plate" + } + ] + }, "result": { "item": "basemetals:electrum_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_gold_cast.json index fedf6ac05..780c635f9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_rod" + } + ] + }, "result": { "item": "basemetals:electrum_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_sand_cast.json index c68d39c16..1ada4ddc0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/electrum/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_rod" + } + ] + }, "result": { "item": "basemetals:electrum_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/block.json index ea07717be..9710ff969 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_block" + } + ] + }, "result": { "item": "basemetals:invar_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_gold_cast.json index 76191a2fb..1cec23998 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_gear" + } + ] + }, "result": { "item": "basemetals:invar_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_sand_cast.json index f3ebc037a..254f7f2af 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_gear" + } + ] + }, "result": { "item": "basemetals:invar_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_gold_cast.json index c84b52258..97e4c7130 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } + ] + }, "result": { "item": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_sand_cast.json index f7440f832..0fd5f2431 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } + ] + }, "result": { "item": "basemetals:invar_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_gold_cast.json index 9a7cff5bf..b66ed1174 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_nugget" + } + ] + }, "result": { "item": "basemetals:invar_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_sand_cast.json index 6e2fe1200..9e1c88e75 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_nugget" + } + ] + }, "result": { "item": "basemetals:invar_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_gold_cast.json index 5efa63571..747c22ed4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_plate" + } + ] + }, "result": { "item": "basemetals:invar_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_sand_cast.json index a66cadf73..edc4ef034 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_plate" + } + ] + }, "result": { "item": "basemetals:invar_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_gold_cast.json index 3a67dc798..156ccb736 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_rod" + } + ] + }, "result": { "item": "basemetals:invar_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_sand_cast.json index 1bd1d078e..aa754f76e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/invar/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_rod" + } + ] + }, "result": { "item": "basemetals:invar_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/block.json index c49cf82a5..f265993be 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_block" + } + ] + }, "result": { "item": "basemetals:lead_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_gold_cast.json index 11cc4b6dd..25d452a0a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_gear" + } + ] + }, "result": { "item": "basemetals:lead_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_sand_cast.json index 73b54c15f..2e9666573 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_gear" + } + ] + }, "result": { "item": "basemetals:lead_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_gold_cast.json index ed15aaf8a..21e83cd86 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_ingot" + } + ] + }, "result": { "item": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_sand_cast.json index 97724911d..05311f45e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_ingot" + } + ] + }, "result": { "item": "basemetals:lead_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_gold_cast.json index ef53c8c83..1edbe9b78 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_nugget" + } + ] + }, "result": { "item": "basemetals:lead_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_sand_cast.json index a02f1c3ea..19256d499 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_nugget" + } + ] + }, "result": { "item": "basemetals:lead_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_gold_cast.json index d8967c56b..33b4f3ca2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_plate" + } + ] + }, "result": { "item": "basemetals:lead_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_sand_cast.json index 5dbe392c1..023eeebbd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_plate" + } + ] + }, "result": { "item": "basemetals:lead_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_gold_cast.json index aeb1dd08a..427b38c65 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_rod" + } + ] + }, "result": { "item": "basemetals:lead_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_sand_cast.json index eda8b1869..f4649ef58 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/lead/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_rod" + } + ] + }, "result": { "item": "basemetals:lead_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/block.json index 7ce4ddd9e..b2309a6b7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_block" + } + ] + }, "result": { "item": "basemetals:mithril_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_gold_cast.json index 03b1369a3..8d5607c5a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_gear" + } + ] + }, "result": { "item": "basemetals:mithril_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_sand_cast.json index ace658526..a9de0ac45 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_gear" + } + ] + }, "result": { "item": "basemetals:mithril_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_gold_cast.json index 3fe327a23..46a515913 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } + ] + }, "result": { "item": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_sand_cast.json index b6e2c272d..c6162a151 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } + ] + }, "result": { "item": "basemetals:mithril_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_gold_cast.json index 6b4946f72..ed7438da2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_nugget" + } + ] + }, "result": { "item": "basemetals:mithril_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_sand_cast.json index 954b403fc..8e527e7aa 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_nugget" + } + ] + }, "result": { "item": "basemetals:mithril_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_gold_cast.json index b85509b4e..c856a3c30 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_plate" + } + ] + }, "result": { "item": "basemetals:mithril_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_sand_cast.json index 0e4e6da18..d12282e7d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_plate" + } + ] + }, "result": { "item": "basemetals:mithril_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_gold_cast.json index 1381e6563..37f237550 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_rod" + } + ] + }, "result": { "item": "basemetals:mithril_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_sand_cast.json index 7bda73945..94173f5e0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/mithril/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_rod" + } + ] + }, "result": { "item": "basemetals:mithril_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/block.json index a2787e9d0..1ca83d28c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_block" + } + ] + }, "result": { "item": "basemetals:nickel_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_gold_cast.json index 9f8504964..b91cae2f1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_gear" + } + ] + }, "result": { "item": "basemetals:nickel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_sand_cast.json index 7f522ff44..c4d7ec477 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_gear" + } + ] + }, "result": { "item": "basemetals:nickel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_gold_cast.json index 96d284b6d..df82f1dcb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } + ] + }, "result": { "item": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_sand_cast.json index ea96c9482..1799b79a8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } + ] + }, "result": { "item": "basemetals:nickel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_gold_cast.json index e234e053d..68c2ed9af 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_nugget" + } + ] + }, "result": { "item": "basemetals:nickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_sand_cast.json index 5158ac635..d1a4586e0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_nugget" + } + ] + }, "result": { "item": "basemetals:nickel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_gold_cast.json index beac0ba17..108f08b9e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_plate" + } + ] + }, "result": { "item": "basemetals:nickel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_sand_cast.json index 9c5d87728..9c00524cd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_plate" + } + ] + }, "result": { "item": "basemetals:nickel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_gold_cast.json index 043b9807a..587e9ecae 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_rod" + } + ] + }, "result": { "item": "basemetals:nickel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_sand_cast.json index b3a83507f..774ebb2f3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/nickel/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_rod" + } + ] + }, "result": { "item": "basemetals:nickel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/block.json index 90a1e35b5..919bcccde 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_block" + } + ] + }, "result": { "item": "basemetals:pewter_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_gold_cast.json index abfab14dc..88bc1bb9d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_gear" + } + ] + }, "result": { "item": "basemetals:pewter_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_sand_cast.json index 71801ce43..28a844c2d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_gear" + } + ] + }, "result": { "item": "basemetals:pewter_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_gold_cast.json index e4a561dc1..40de78b06 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_ingot" + } + ] + }, "result": { "item": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_sand_cast.json index c431433d9..6e460541e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_ingot" + } + ] + }, "result": { "item": "basemetals:pewter_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_gold_cast.json index 13d43515d..3c618e6e1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_nugget" + } + ] + }, "result": { "item": "basemetals:pewter_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_sand_cast.json index 5c33f5ff5..b3304110c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_nugget" + } + ] + }, "result": { "item": "basemetals:pewter_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_gold_cast.json index ac27319c8..0c081d3e9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_plate" + } + ] + }, "result": { "item": "basemetals:pewter_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_sand_cast.json index 7a351e99e..ad992f963 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_plate" + } + ] + }, "result": { "item": "basemetals:pewter_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_gold_cast.json index 73cb9da74..d743e5f30 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_rod" + } + ] + }, "result": { "item": "basemetals:pewter_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_sand_cast.json index a4e18b6b8..fc05cdae2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/pewter/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_rod" + } + ] + }, "result": { "item": "basemetals:pewter_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/block.json index 05e058000..5b6a0c924 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_block" + } + ] + }, "result": { "item": "basemetals:platinum_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_gold_cast.json index 21929d5ca..eb57ba033 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_gear" + } + ] + }, "result": { "item": "basemetals:platinum_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_sand_cast.json index b0cdba683..4ca94a2d1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_gear" + } + ] + }, "result": { "item": "basemetals:platinum_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_gold_cast.json index 9f401a1ad..f29a9123b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_ingot" + } + ] + }, "result": { "item": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_sand_cast.json index 8a6fb3f6a..c3a24fee9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_ingot" + } + ] + }, "result": { "item": "basemetals:platinum_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_gold_cast.json index d326f3e4e..db26dd64c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_nugget" + } + ] + }, "result": { "item": "basemetals:platinum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_sand_cast.json index 8df691c21..3a59f8962 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_nugget" + } + ] + }, "result": { "item": "basemetals:platinum_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_gold_cast.json index 15e0f6a6d..41955641a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_plate" + } + ] + }, "result": { "item": "basemetals:platinum_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_sand_cast.json index 37a0463b2..2e3eb67e6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_plate" + } + ] + }, "result": { "item": "basemetals:platinum_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_gold_cast.json index 53096fc9a..6e48427f2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_rod" + } + ] + }, "result": { "item": "basemetals:platinum_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_sand_cast.json index 9a3b8d7fe..08204567a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/platinum/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_rod" + } + ] + }, "result": { "item": "basemetals:platinum_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/block.json index 3c1122a8b..040d9eebc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_block" + } + ] + }, "result": { "item": "basemetals:silver_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_gold_cast.json index 5a5f9f4dd..e594335a4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_gear" + } + ] + }, "result": { "item": "basemetals:silver_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_sand_cast.json index 93b1dae7c..9bc03ead1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_gear" + } + ] + }, "result": { "item": "basemetals:silver_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_gold_cast.json index 3c4a4bb9a..87f759081 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } + ] + }, "result": { "item": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_sand_cast.json index 2bf4a2db1..83f2db4cf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } + ] + }, "result": { "item": "basemetals:silver_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_gold_cast.json index c8e1f6f75..6d8fbca32 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_nugget" + } + ] + }, "result": { "item": "basemetals:silver_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_sand_cast.json index b5fa796ad..982450129 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_nugget" + } + ] + }, "result": { "item": "basemetals:silver_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_gold_cast.json index 1ae47110b..552f5985c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_plate" + } + ] + }, "result": { "item": "basemetals:silver_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_sand_cast.json index 291eebf4f..f4ca7e49b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_plate" + } + ] + }, "result": { "item": "basemetals:silver_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_gold_cast.json index dc15ff7d3..250871bf9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_rod" + } + ] + }, "result": { "item": "basemetals:silver_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_sand_cast.json index a04c3dcc2..860f92199 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/silver/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_rod" + } + ] + }, "result": { "item": "basemetals:silver_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/block.json index 4fe9281e0..8641c9089 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_block" + } + ] + }, "result": { "item": "basemetals:starsteel_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_gold_cast.json index 475cca6d9..3921e6966 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_gear" + } + ] + }, "result": { "item": "basemetals:starsteel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_sand_cast.json index cb3848d08..81a833ef1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_gear" + } + ] + }, "result": { "item": "basemetals:starsteel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_gold_cast.json index 8aba3972e..e24509e58 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_ingot" + } + ] + }, "result": { "item": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_sand_cast.json index 93ffc9790..b3bf7b238 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_ingot" + } + ] + }, "result": { "item": "basemetals:starsteel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_gold_cast.json index 334c0f891..ff95c79fd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_nugget" + } + ] + }, "result": { "item": "basemetals:starsteel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_sand_cast.json index 32af64c5d..cd5e59abe 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_nugget" + } + ] + }, "result": { "item": "basemetals:starsteel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_gold_cast.json index d57ad3833..7e1960a6c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_plate" + } + ] + }, "result": { "item": "basemetals:starsteel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_sand_cast.json index 0912222ef..c302a1465 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_plate" + } + ] + }, "result": { "item": "basemetals:starsteel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_gold_cast.json index 32369b28f..57eca1595 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_rod" + } + ] + }, "result": { "item": "basemetals:starsteel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_sand_cast.json index 8244d4bd5..d2431ff3d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/starsteel/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_rod" + } + ] + }, "result": { "item": "basemetals:starsteel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/block.json index 6ea4e4270..3172363af 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_block" + } + ] + }, "result": { "item": "basemetals:steel_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_gold_cast.json index f414d7e8c..e603ce477 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_gear" + } + ] + }, "result": { "item": "basemetals:steel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_sand_cast.json index 2d3b4a456..7b8deb088 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_gear" + } + ] + }, "result": { "item": "basemetals:steel_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_gold_cast.json index fb4f80d02..bae95919d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } + ] + }, "result": { "item": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_sand_cast.json index ab12fb5b6..fed834b73 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } + ] + }, "result": { "item": "basemetals:steel_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_gold_cast.json index 3470e6636..08c23a039 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_nugget" + } + ] + }, "result": { "item": "basemetals:steel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_sand_cast.json index b7290db2a..cda8511bf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_nugget" + } + ] + }, "result": { "item": "basemetals:steel_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_gold_cast.json index ca604773c..481c14479 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_plate" + } + ] + }, "result": { "item": "basemetals:steel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_sand_cast.json index deb593a6c..1a0d332a9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_plate" + } + ] + }, "result": { "item": "basemetals:steel_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_gold_cast.json index e194383cd..e1f39f641 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_rod" + } + ] + }, "result": { "item": "basemetals:steel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_sand_cast.json index 18c92c6a2..d51b3bf7c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/steel/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_rod" + } + ] + }, "result": { "item": "basemetals:steel_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/block.json index bf19b3a17..a27325ade 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_block" + } + ] + }, "result": { "item": "basemetals:tin_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_gold_cast.json index 477f0a1e0..f20365307 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_gear" + } + ] + }, "result": { "item": "basemetals:tin_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_sand_cast.json index 8afd97e6c..8b7465c39 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_gear" + } + ] + }, "result": { "item": "basemetals:tin_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_gold_cast.json index 64316f8ca..660160f07 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_ingot" + } + ] + }, "result": { "item": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_sand_cast.json index 4d45e90d5..92e7ed086 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_ingot" + } + ] + }, "result": { "item": "basemetals:tin_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_gold_cast.json index 336271d05..e908ae9c3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_nugget" + } + ] + }, "result": { "item": "basemetals:tin_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_sand_cast.json index b08fadecd..011a70cc1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_nugget" + } + ] + }, "result": { "item": "basemetals:tin_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_gold_cast.json index 9ab3492ef..920d159a8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_plate" + } + ] + }, "result": { "item": "basemetals:tin_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_sand_cast.json index d78b01b34..b373fbede 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_plate" + } + ] + }, "result": { "item": "basemetals:tin_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_gold_cast.json index 1df689cc8..ea3293018 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_rod" + } + ] + }, "result": { "item": "basemetals:tin_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_sand_cast.json index ceca64bbb..24ab6109e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/tin/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_rod" + } + ] + }, "result": { "item": "basemetals:tin_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/block.json index 6127a7eea..179bcba6f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/block.json @@ -1,20 +1,23 @@ { "type": "tconstruct:casting_basin", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_block" - } - ], "cooling_time": 141, "fluid": { "amount": 810, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_block" + } + ] + }, "result": { "item": "basemetals:zinc_block" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_gold_cast.json index 2176c3b76..4ee4b0518 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/gear" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_gear" + } + ] + }, "result": { "item": "basemetals:zinc_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_sand_cast.json index 26ca2ad58..ea6e25bd7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/gear_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/gear" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_gear" - } - ], "cooling_time": 90, "fluid": { "amount": 360, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_gear" + } + ] + }, "result": { "item": "basemetals:zinc_gear" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_gold_cast.json index 7cc7fd7f5..405273cfd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/ingot" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_ingot" + } + ] + }, "result": { "item": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_sand_cast.json index 86461d512..27e73f0ce 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/ingot_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/ingot" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_ingot" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_ingot" + } + ] + }, "result": { "item": "basemetals:zinc_ingot" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_gold_cast.json index 86d81c19a..9e0d25f65 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/nugget" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_nugget" + } + ] + }, "result": { "item": "basemetals:zinc_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_sand_cast.json index 10b8fd2dc..c7928e02e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/nugget_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/nugget" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_nugget" - } - ], "cooling_time": 16, "fluid": { "amount": 10, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_nugget" + } + ] + }, "result": { "item": "basemetals:zinc_nugget" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_gold_cast.json index b76ba3945..7c05459f0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/plate" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_plate" + } + ] + }, "result": { "item": "basemetals:zinc_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_sand_cast.json index 8b33eafa8..270d44989 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/plate_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/plate" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_plate" - } - ], "cooling_time": 45, "fluid": { "amount": 90, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_plate" + } + ] + }, "result": { "item": "basemetals:zinc_plate" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_gold_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_gold_cast.json index b7f50bd57..bdd78a4df 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_gold_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_gold_cast.json @@ -3,21 +3,24 @@ "cast": { "tag": "tconstruct:casts/multi_use/rod" }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_rod" + } + ] + }, "result": { "item": "basemetals:zinc_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_sand_cast.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_sand_cast.json index 8bde0352c..94cb6595f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_sand_cast.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/casting/zinc/rod_sand_cast.json @@ -4,21 +4,24 @@ "tag": "tconstruct:casts/single_use/rod" }, "cast_consumed": true, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_rod" - } - ], "cooling_time": 30, "fluid": { "amount": 45, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_rod" + } + ] + }, "result": { "item": "basemetals:zinc_rod" } diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/ingot.json index 26c6f4a14..4fff930ff 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/nugget.json index 3c3ec759e..9c592e930 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/storage_blocks.json index 52b09ebec..7fbaa5994 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/adamantine/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/ingot.json index e412c38b1..a663d8939 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/nugget.json index 54de7ddc0..1b88a28c8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/storage_blocks.json index 118b97ca8..e126d5c39 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/antimony/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/ingot.json index db836159a..4be40e888 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/nugget.json index dcab9b51c..427f0fe43 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/storage_blocks.json index 78692e5c0..f5e61ce17 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/aquarium/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/ingot.json index 379d0ae35..2132f8964 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/nugget.json index 9a252d8b0..1539258f8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/storage_blocks.json index 3293b8da5..48d1d7d24 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bismuth/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/ingot.json index 1d349e78b..f41b2cb5b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/nugget.json index 586ac2086..7f3821dd4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/storage_blocks.json index cc8f83473..a236fc594 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/brass/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/ingot.json index a2c5b08e8..b6afcb745 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/nugget.json index 22203e3c1..9d018cec6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/storage_blocks.json index 44de17211..be6f2360e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/bronze/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/adamantine.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/adamantine.json index 4e2db71ab..829f29670 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/adamantine.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/adamantine.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_adamantine" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:adamantine", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/antimony.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/antimony.json index 69c492a45..3c8fb9e5c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/antimony.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/antimony.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_antimony" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:antimony", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/aquarium.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/aquarium.json index 046df413b..a3302f6bb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/aquarium.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/aquarium.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_aquarium" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:aquarium", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bismuth.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bismuth.json index 7a3a182f4..4cdca933e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bismuth.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bismuth.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_bismuth" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:bismuth", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/brass.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/brass.json index b6479433e..fff348c4d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/brass.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/brass.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_brass" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:brass", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bronze.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bronze.json index cc203d8ea..2e570edb8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bronze.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/bronze.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_bronze" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:bronze", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/coldiron.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/coldiron.json index 79ed51203..22350ad2f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/coldiron.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/coldiron.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_coldiron" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:coldiron", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/copper.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/copper.json index ce3224bd2..62cdfb7dd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/copper.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/copper.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_copper" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:copper", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/cupronickel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/cupronickel.json index d1e5781ee..98840da1c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/cupronickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/cupronickel.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_cupronickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:cupronickel", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/electrum.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/electrum.json index 6453fd96d..6be732b52 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/electrum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/electrum.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_electrum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:electrum", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/invar.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/invar.json index 4a301cc8f..cffe45b37 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/invar.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/invar.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_invar" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:invar", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/lead.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/lead.json index bdebb3fbb..40cf56299 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/lead.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/lead.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_lead" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:lead", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/mithril.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/mithril.json index 55360855b..d4701691e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/mithril.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/mithril.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_mithril" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:mithril", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/nickel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/nickel.json index 44fe3b9fe..6a4cce7e7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/nickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/nickel.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_nickel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:nickel", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/pewter.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/pewter.json index f5f0d33e2..6a981f6fd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/pewter.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/pewter.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_pewter" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:pewter", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/platinum.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/platinum.json index d5119217f..96d2c3017 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/platinum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/platinum.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_platinum" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:platinum", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/silver.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/silver.json index e17f3dc97..f70b30c27 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/silver.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/silver.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_silver" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:silver", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/starsteel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/starsteel.json index c69adca08..1d54403d8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/starsteel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/starsteel.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_starsteel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:starsteel", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/steel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/steel.json index 532dc2c1b..6d5d3e32c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/steel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/steel.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_steel" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:steel", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/tin.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/tin.json index ac7885b96..b74cb3767 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/tin.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/tin.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_tin" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:tin", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/zinc.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/zinc.json index 8028a23e5..4d35f0587 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/zinc.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/casting/zinc.json @@ -1,15 +1,18 @@ { "type": "tconstruct:material_fluid", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], "fluid": { "amount": 90, "tag": "forge:molten_zinc" }, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "output": "basemetals:zinc", "temperature": 769 } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/ingot.json index 734147ac7..5ece6340e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/nugget.json index 917ef0728..6fbef5b3b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/storage_blocks.json index 8438d889a..5061f36c9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/coldiron/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/ingot.json index 1e81fcc51..c9d930c7d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/nugget.json index d71c49725..2d90a4cf5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/storage_blocks.json index ec1bda344..eac9d6b49 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/copper/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/ingot.json index f37e266fb..b83d5128d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/nugget.json index 08c165dae..32aafa936 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/storage_blocks.json index ad83193a5..adad0feef 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/cupronickel/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/ingot.json index 4599ebd7a..281336260 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/nugget.json index 2279b8ca8..ac4110c5c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/storage_blocks.json index b6107ae13..947dfec6f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/electrum/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/ingot.json index 77f97d964..d0724a7e7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/nugget.json index 7aa5c4ce2..204285e12 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/storage_blocks.json index 3c30a6d17..8a1fd067c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/invar/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/ingot.json index 0311f7f13..f4a2cc774 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/nugget.json index 0396cd67c..5217f3a5f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/storage_blocks.json index 86355fb8d..d4c2d12dd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/lead/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/adamantine.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/adamantine.json index 0837e745b..aa63552cf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/adamantine.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/adamantine.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:adamantine", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/antimony.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/antimony.json index edd9d1a55..bbc7f1ad9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/antimony.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/antimony.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:antimony", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/aquarium.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/aquarium.json index e9dae1045..e48ca8bdf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/aquarium.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/aquarium.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:aquarium", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bismuth.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bismuth.json index 80e1ea03f..ffaeaadc4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bismuth.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bismuth.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:bismuth", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/brass.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/brass.json index 61228252f..3bd259321 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/brass.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/brass.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:brass", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bronze.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bronze.json index 1ddf1c95f..8516f5d3c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bronze.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/bronze.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:bronze", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/coldiron.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/coldiron.json index 5f81935ba..c4a24bdf0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/coldiron.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/coldiron.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:coldiron", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/copper.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/copper.json index b1a8c3679..651eaec01 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/copper.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/copper.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:copper", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/cupronickel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/cupronickel.json index e2a0547fe..610947dd6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/cupronickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/cupronickel.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:cupronickel", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/electrum.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/electrum.json index 7c3a82295..86b2b5c79 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/electrum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/electrum.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:electrum", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/invar.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/invar.json index d93795cb8..63fb36c66 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/invar.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/invar.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:invar", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/lead.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/lead.json index 8f31bd44d..a6f7bcadd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/lead.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/lead.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:lead", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/mithril.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/mithril.json index c9eba6efa..0c4c53ae9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/mithril.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/mithril.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:mithril", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/nickel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/nickel.json index 065be2124..2487a5c92 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/nickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/nickel.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:nickel", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/pewter.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/pewter.json index 5ab3e6287..d2888162e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/pewter.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/pewter.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:pewter", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/platinum.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/platinum.json index 7fdf76323..38297ae06 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/platinum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/platinum.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:platinum", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/silver.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/silver.json index 659ebe662..c9e3e77c3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/silver.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/silver.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:silver", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/starsteel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/starsteel.json index dd1b65b29..bd9ff250b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/starsteel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/starsteel.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:starsteel", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/steel.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/steel.json index 2659d3a27..e673f49a1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/steel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/steel.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:steel", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/tin.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/tin.json index 4d8602a46..fb6e98411 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/tin.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/tin.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:tin", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/zinc.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/zinc.json index 175eb9f99..acd3ec9b6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/zinc.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/melting/zinc.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material_melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "input": "basemetals:zinc", "result": { "amount": 90, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/ingot.json index 0549041aa..870cbf76b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/nugget.json index fae58b278..067aa64df 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/storage_blocks.json index d5483fff2..2f09e2a83 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/mithril/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/ingot.json index 88f339c34..44888123e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/nugget.json index 98ca884fd..a4ac91413 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/storage_blocks.json index a64874749..6507b81ef 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/nickel/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/ingot.json index d542663e3..7cc1b614b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/nugget.json index 8c8859f07..b09cb4338 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/storage_blocks.json index 36e7b118c..e08a55d9f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/pewter/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/ingot.json index 2607526c6..ebcb19046 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/nugget.json index 8438676b7..54c13dd34 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/storage_blocks.json index 823e2d666..88e951ead 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/platinum/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/ingot.json index cb25211b2..712dd29b3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/nugget.json index e2781749e..b5322e3ef 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/storage_blocks.json index cb84af8ce..f0ce7d6ef 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/silver/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/ingot.json index 90bd65441..719825482 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/nugget.json index 5700534eb..9f66d9fdc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/storage_blocks.json index 2e3ac07ec..6836b9104 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/starsteel/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/ingot.json index 2f017fdb7..af0b802cf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/nugget.json index ef1c7a950..72459071a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/storage_blocks.json index b71a3be45..a66ae2ce7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/steel/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/ingot.json index 81a6a704c..88b8213a1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/nugget.json index e37980b60..a8db7ad72 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/storage_blocks.json index 4e623e631..866ef498d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/tin/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/ingot.json index d9e1b4e82..0682fbc6b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/nugget.json index 169483792..1bc6444d0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/storage_blocks.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/storage_blocks.json index 88d6b596f..25a2c2473 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/storage_blocks.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/materials/zinc/storage_blocks.json @@ -1,11 +1,14 @@ { "type": "tconstruct:material", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/block.json index f518e853d..b0db293b1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/gear.json index 6589aba2f..9bfac5f97 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/ingot.json index 996002871..daa4c0439 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/nugget.json index 5cc9f03e6..8ee809ee9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/plate.json index bb2865ecf..12d688ea5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/rod.json index 21a4a6617..b93e18720 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/adamantine/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/block.json index 600c6dcdd..caec7f925 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/gear.json index a8e18bf3e..3e7c67d72 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/ingot.json index a069eae0a..042967cb7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/nugget.json index 693b39d67..fcbde02bb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/plate.json index 6aa5ff976..67c748758 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/rod.json index 0eb835c88..2862abd3d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/antimony/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/block.json index de5a1700e..c3284b535 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/gear.json index af044e585..7de34f002 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/ingot.json index 020f6146b..b961baa53 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/nugget.json index 2e8ac6da6..e2d42010d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/plate.json index 35e207a3f..37bca5bad 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/rod.json index 4f0a86144..d23a77d2e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/aquarium/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/block.json index eaf0b4867..08a087cfe 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/gear.json index 2d14c72cd..8d9e49224 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/ingot.json index 2f626e4df..5dbf100f5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/nugget.json index 95525bc45..d19c7f9e6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/plate.json index ef7d2a78a..9812c6f6c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/rod.json index 3fe624cce..2d5364428 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bismuth/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/block.json index 9635b61f6..74577ee4f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/gear.json index 7734f9937..346797077 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/ingot.json index e4052d804..364c07712 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/nugget.json index a9ea31257..60f568812 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/plate.json index 24085deb6..a589086e0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/rod.json index 800b11a69..c14f79e07 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/brass/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/block.json index 538c5a8a5..48f049788 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/gear.json index dbd0b6e9e..42ba14868 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/ingot.json index 93838699e..b809d41b7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/nugget.json index a870865fc..de1a5fdbd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/plate.json index 5efdf13fe..cf7fda511 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/rod.json index dd1deedbf..3298289ff 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/bronze/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/block.json index 743678e05..ffcfe6b35 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/gear.json index be7464ef2..12d94440f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/ingot.json index 94cc591cd..e68603c4e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/nugget.json index 86c824299..cdc0d14d5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/plate.json index 4e468dd0e..65540aec8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/rod.json index 6ebc789c0..5e81130b2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/coldiron/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/block.json index 30e04c058..66486b036 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/gear.json index d1995ccc5..cb21a6b28 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/ingot.json index 5f4982691..8135e846e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/nugget.json index 23df3d6ef..61f4351f4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/plate.json index def732bf1..90e6aad01 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/rod.json index 0cc66207f..3fd07f1a7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/copper/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/block.json index adf168924..6807d2991 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/gear.json index b45d6f0f9..b432dbe64 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/ingot.json index bb79f4e41..46103b71b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/nugget.json index 73d0a8b19..5f22347c4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/plate.json index 8a68ae5cf..a61a53d5d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/rod.json index 0f42a4985..a8c7a259b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/cupronickel/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/block.json index d62109283..e51c8412b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/gear.json index 225ba420d..59b081803 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/ingot.json index 201c6c372..0718f83e8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/nugget.json index e343a49a5..a3d049c9a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/plate.json index 735b138e1..471e6a6de 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/rod.json index 97368ecfe..424b848ff 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/electrum/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/block.json index ab606492d..0a3ecd6ed 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/gear.json index 2a10a0db7..0725c7beb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/ingot.json index ed7b450e8..fe39c26fe 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/nugget.json index 249987664..d4ac41cbc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/plate.json index c2bcc19e2..179678538 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/rod.json index 4b92631c2..7f6fbe710 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/invar/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/block.json index 01e3d962b..09f0de1a6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/gear.json index 7266eaf94..8af14842a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/ingot.json index 6b89ec091..e0329d84e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/nugget.json index ef5d1cf67..39bbaaca6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/plate.json index 6b853c674..410ae1b8f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/rod.json index 49daeb9ac..db21b5946 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/lead/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/ingot.json index 23f097ea9..51d257124 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/nugget.json index 05d5d2521..ccace5a44 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mercury/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/block.json index 8f412adfa..15cd8ce0d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/gear.json index dd0c27196..2354fad90 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/ingot.json index 1ef790f3c..efb220755 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/nugget.json index 803694a76..612f04a28 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/plate.json index 718c46e80..9d3406852 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/rod.json index 47e12bf92..62d206cd1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/mithril/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/block.json index bc94daf2f..98ed10b3a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/gear.json index 2a434959d..7be0f1fe3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/ingot.json index 52d1d5027..537cf6665 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/nugget.json index 8d549665e..ad64c8c4d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/plate.json index d11a9f7ba..3ac7411ae 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/rod.json index 7b96c3c4f..fb08aa014 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/nickel/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/block.json index 92eb843df..2fd7e0599 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/gear.json index c2ad849ed..a744fa6fd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/ingot.json index d27cdf0dd..dcbbe93e0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/nugget.json index ba5cd7d62..7407ebb95 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/plate.json index b581b2ee5..a3675a380 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/rod.json index 741de335d..ea1e01f31 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/pewter/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/block.json index 3c7b552c3..6be9c8b14 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/gear.json index 4efb6b422..d17dc1768 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/ingot.json index 68c11bf87..220ed5777 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/nugget.json index 0d9af3937..5b9dec5af 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/plate.json index a2cb194a2..b0c69744e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/rod.json index acb9d5e30..c9698bd73 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/platinum/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/block.json index c9a5d3130..847e89514 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/gear.json index 689d5f6dc..62c36ed51 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/ingot.json index 85ac8543b..b8c6e2f87 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/nugget.json index de38a9334..dcf362b56 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/plate.json index a03a67e06..8ca2f0b64 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/rod.json index ca04b34a6..11886e967 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/silver/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/block.json index a32959db7..c84249291 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/gear.json index ce7a29a3c..8d17aae7d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/ingot.json index 66517022b..7babf9a52 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/nugget.json index 526fe668a..dba090fac 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/plate.json index 665f7153d..986be8cf9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/rod.json index f5d5f4c4c..08a1b6c54 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/starsteel/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/block.json index 9b84fbfbe..5a6a501b6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/gear.json index cca001971..3ee16c7b6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/ingot.json index ddcb014b1..1c6300e9f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/nugget.json index 3dfa9112f..817d0f211 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/plate.json index 5b45cbe04..41ea1c371 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/rod.json index 34f8fe6b6..3285f563d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/steel/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/block.json index d8ad76032..a06985563 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/gear.json index 33ec85568..8182dacff 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/ingot.json index 0410f45bd..0aac60aa0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/nugget.json index eadb7fbde..8dda9043a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/plate.json index 98d6d899e..a853269f8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/rod.json index 9b9635424..9d8ebf57f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/tin/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/block.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/block.json index 1077e532a..a6cf99b96 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/block.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/block.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:storage_blocks/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/gear.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/gear.json index a5998041e..e85e9fcbc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/gear.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/gear.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:gears/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/ingot.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/ingot.json index 7e44e82ba..2f959ef91 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/ingot.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/ingot.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:ingots/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/nugget.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/nugget.json index 4f62b842a..a9cbf21cf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/nugget.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/nugget.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:nuggets/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/plate.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/plate.json index 5f99498f7..95b688dbc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/plate.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/plate.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:plates/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/rod.json b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/rod.json index a7afe526d..2b7ec3586 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/rod.json +++ b/src/generated/resources/data/basemetals/recipes/compat/tconstruct/melting/zinc/rod.json @@ -1,11 +1,14 @@ { "type": "tconstruct:melting", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tconstruct" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "tconstruct" + } + ] + }, "ingredient": { "tag": "forge:rods/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/dust_furnace.json index 6b778504c..986e4424f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/gear_press.json index bf8bd9670..b430ad387 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_crucible.json index 39e0b32bb..e30205bbd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_pulverizing.json index a54f12386..469dd4347 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ore_pulverizing.json index 07af970a4..3b61084c1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/plate_press.json index a1d1fe0a9..dcdcd70ce 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/adamantine/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:adamantine_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:adamantine_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/adamantine" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/aquarium.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/aquarium.json index 02299f40f..746a32e7a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/aquarium.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/aquarium.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } + ] + }, "ingredients": [ { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/brass.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/brass.json index 872858b4b..82f095514 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/brass.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/brass.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } + ] + }, "ingredients": [ { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/bronze.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/bronze.json index 7e53454dc..79ad4b288 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/bronze.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/bronze.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } + ] + }, "ingredients": [ { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/cupronickel.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/cupronickel.json index 179bab9a4..dd7cbf65c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/cupronickel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/cupronickel.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_ingot" + } + ] + }, "ingredients": [ { "count": 3, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/electrum.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/electrum.json index 818801127..def86c3cc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/electrum.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/electrum.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } + ] + }, "ingredients": [ { "count": 1, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/invar.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/invar.json index 8f6266a6e..4c012c24a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/invar.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/invar.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } + ] + }, "ingredients": [ { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/mithril.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/mithril.json index 5cc086752..beecd44db 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/mithril.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/mithril.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } + ] + }, "ingredients": [ { "count": 2, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/pewter.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/pewter.json index abc91c558..4d87eea05 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/pewter.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/pewter.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_ingot" + } + ] + }, "ingredients": [ { "count": 1, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/steel.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/steel.json index 63604f28b..b0f8d4a6e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/steel.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/alloys/steel.json @@ -1,16 +1,19 @@ { "type": "thermal:smelter", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_ingot" - } - ], "energy": 6400, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } + ] + }, "ingredients": [ { "count": 8, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/dust_furnace.json index 5290e5906..d496b73db 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/gear_press.json index f5ef1dd59..1aea90c9c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_crucible.json index 2228167b2..f0cb2df8e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_pulverizing.json index 13b33f91c..9ae7942c2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ore_pulverizing.json index 6e009cdfc..ebc872d04 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/plate_press.json index e93ff4923..1d592a4d2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/antimony/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:antimony_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:antimony_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/antimony" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/dust_furnace.json index 6864b59ee..67db84616 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/gear_press.json index 9dce91726..b7b2525b2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_crucible.json index 3ef3c78f1..f3c06f965 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_pulverizing.json index 7ca7ce25a..a82f88fd6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/plate_press.json index 6eb6857a0..9f4b8c88f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/aquarium/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:aquarium_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:aquarium_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/aquarium" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/dust_furnace.json index 1a41da330..5365a3471 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/gear_press.json index c3395732e..d05917b66 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_crucible.json index a277f229c..f2eaae57b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_pulverizing.json index d161bad3b..b8cc6203f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ore_pulverizing.json index 402c3b99e..c630803a7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/plate_press.json index 1a2be6fdc..363f959ce 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bismuth/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bismuth_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bismuth_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/bismuth" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/dust_furnace.json index 5be5b6b62..0d365bd12 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/gear_press.json index 14633d854..d56390fbf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_crucible.json index 272b9109a..b17cdcbcc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_pulverizing.json index 0b9c23cf1..b4927c47d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/plate_press.json index 409147cdf..1af13295e 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/brass/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:brass_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:brass_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/brass" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/dust_furnace.json index 5001e5cb8..7dbd3edb8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/gear_press.json index dbe370b95..854b2fdc5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_crucible.json index b37cf5f4a..722bda3f5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_pulverizing.json index 7380009f1..cc744a90f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/plate_press.json index bfd42e16b..1a678de57 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/bronze/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:bronze_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:bronze_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/bronze" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/dust_furnace.json index 44b039740..dfd100155 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/gear_press.json index 87afb77bb..b10a2dcb3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_crucible.json index 8f4ebb1dd..002c5f869 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_pulverizing.json index 74c1a4ca9..7a0e7e823 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ore_pulverizing.json index 73654baea..86702a6b9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/plate_press.json index 291df731a..c4b8a3b3f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/coldiron/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:coldiron_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:coldiron_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/coldiron" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json index 5669da787..d371d6977 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/gear_press.json index d1cc42d41..d22587d56 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_crucible.json index f5db9080c..3f3728338 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_pulverizing.json index 53ce0c8e0..02570da7c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ore_pulverizing.json index 897cf17e4..120e7ac11 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/plate_press.json index 3e8c114cc..a262775f4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/copper/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:copper_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:copper_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/copper" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/dust_furnace.json index ed73fe939..e88d64f21 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/gear_press.json index 6a32e423c..20d1177f3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_crucible.json index 09bfbbd85..7f7ec11ee 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_pulverizing.json index 77fade5c3..3bdea040a 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/plate_press.json index d82760197..d78f05c11 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/cupronickel/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:cupronickel_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:cupronickel_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/cupronickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/dust_furnace.json index 99aaafabc..753f58318 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/gear_press.json index 0a89af703..578b9e7dc 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_crucible.json index 6a417dabf..35bf1e4d0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_pulverizing.json index 1f909354c..00e40965d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/plate_press.json index f1479587c..ecbd5d199 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/electrum/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:electrum_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:electrum_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/electrum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/dust_furnace.json index 79d9259d0..60d8110ec 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/gear_press.json index 5c3609dbb..ceb5c6108 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_crucible.json index 5807a64ab..2d34560da 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_pulverizing.json index 3fe1b482e..329b5661f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/plate_press.json index 03b31f109..b5e77d0b4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/invar/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:invar_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:invar_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/invar" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/dust_furnace.json index eadaaca77..8fbe49600 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/gear_press.json index 01721fce2..ef5e60bfb 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_crucible.json index 8b8ecaa25..269e4d4a6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_pulverizing.json index 8dbc7e954..90483b54b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ore_pulverizing.json index 326295360..b80d7910b 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/plate_press.json index 26f5d9aca..46fbce3c7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/lead/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:lead_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:lead_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/lead" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/dust_furnace.json index 4952ec74f..f440c15c7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mercury_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mercury_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_crucible.json index d924f726e..e285f0c0d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_pulverizing.json index ff96b97d3..f2efc7e02 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mercury_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mercury_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ore_pulverizing.json index 8c078c3c8..5f28c85e5 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mercury/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mercury_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mercury_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/mercury" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/dust_furnace.json index 3804b8681..b1077a6d6 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/gear_press.json index c29ef9dd6..d1dcb03d9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_crucible.json index f986a7f12..f9c18b67c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_pulverizing.json index 61a132872..1782192e1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/plate_press.json index 0c3e2f058..eb0e2b91f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/mithril/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:mithril_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:mithril_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/mithril" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/dust_furnace.json index f5ff46f05..0d9550cba 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/gear_press.json index 47177e171..78e66137f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_crucible.json index 41131a856..4f9a06423 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_pulverizing.json index 0bbb59ca9..599e2bd6d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ore_pulverizing.json index 0ddaa9888..7b3599a01 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/plate_press.json index c3e1a25a0..8f30bc0b2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/nickel/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:nickel_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:nickel_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/nickel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/dust_furnace.json index 1c4e40db1..9daed1e00 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/gear_press.json index 2498d19ed..da5c2f664 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_crucible.json index 05390bd94..d087a94c0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_pulverizing.json index 2bedc4052..47913a305 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/plate_press.json index 72175ae07..340d20618 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/pewter/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:pewter_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:pewter_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/pewter" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/dust_furnace.json index 584ddecac..90ba22146 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/gear_press.json index 19a00e639..4e888b960 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_crucible.json index 7a4eb75d6..726929603 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_pulverizing.json index 2c005db53..71f2c19f1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ore_pulverizing.json index 5b5d21c01..ed896f4f3 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/plate_press.json index 69767eca5..c676ae2cf 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/platinum/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:platinum_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:platinum_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/platinum" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/dust_furnace.json index de14e41e7..bf66e5f61 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/gear_press.json index cc6e680fa..69afe1399 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_crucible.json index 5effd5e14..92079cd67 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_pulverizing.json index c12c15fa3..bbc4426b2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ore_pulverizing.json index af31a1f27..fc8879f72 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/plate_press.json index 5d9675c8f..2548b60dd 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/silver/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:silver_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:silver_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/silver" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/dust_furnace.json index eae5ab61d..2474d44de 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/gear_press.json index f59a952e1..dbe24f390 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_crucible.json index c276cc277..702f604f7 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_pulverizing.json index c03f7f930..91afa3e19 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ore_pulverizing.json index b9f5e94a6..24afcedc2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/plate_press.json index 8e01394ca..93de95b80 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/starsteel/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:starsteel_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:starsteel_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/starsteel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/dust_furnace.json index e61a6d43c..a626891d0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/gear_press.json index 4c6f8f5b3..4ca8640d4 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_crucible.json index 58b157ec8..c8dcd7c4f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_pulverizing.json index 4c5ca18a0..3818375e0 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/plate_press.json index 4a5119b29..44399eaf8 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/steel/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:steel_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:steel_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/steel" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/dust_furnace.json index 51ed1a99b..9a68f43d2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/gear_press.json index 5f26b2a24..002a4250c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_crucible.json index 43ccf7cc7..6cb35a6a9 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_pulverizing.json index 328357a28..94563524d 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ore_pulverizing.json index 5460b7308..f1e538c54 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/plate_press.json index 5adb19ea5..c966c672f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/tin/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:tin_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:tin_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/tin" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/dust_furnace.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/dust_furnace.json index b67e34a4c..55bd980d1 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/dust_furnace.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/dust_furnace.json @@ -1,16 +1,19 @@ { "type": "thermal:furnace", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_ingot" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_ingot" + } + ] + }, "ingredient": { "tag": "forge:dusts/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/gear_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/gear_press.json index 12617a1b2..691211610 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/gear_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/gear_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_gear" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_gear" + } + ] + }, "ingredients": [ { "count": 4, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_crucible.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_crucible.json index f1877b287..3648722d2 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_crucible.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_crucible.json @@ -1,12 +1,15 @@ { "type": "thermal:crucible", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - } - ], "energy": 2000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + } + ] + }, "ingredient": { "tag": "forge:ingots/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_pulverizing.json index 293dfe5b3..07f3d4e39 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ingot_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "ingredient": { "tag": "forge:ingots/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ore_pulverizing.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ore_pulverizing.json index 1eb306a43..27c48809c 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ore_pulverizing.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/ore_pulverizing.json @@ -1,16 +1,19 @@ { "type": "thermal:pulverizer", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_powder" - } - ], "energy": 4000, + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_powder" + } + ] + }, "ingredient": { "tag": "forge:ores/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/plate_press.json b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/plate_press.json index 55c94012b..1ba4f8e9f 100644 --- a/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/plate_press.json +++ b/src/generated/resources/data/basemetals/recipes/compat/thermal/zinc/plate_press.json @@ -1,15 +1,18 @@ { "type": "thermal:press", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thermal_expansion" - }, - { - "type": "basemetals:content_mode", - "item": "basemetals:zinc_plate" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "thermal_expansion" + }, + { + "type": "basemetals:content_mode", + "item": "basemetals:zinc_plate" + } + ] + }, "ingredient": { "tag": "forge:ingots/zinc" }, diff --git a/src/generated/resources/data/basemetals/recipes/copper_arrow.json b/src/generated/resources/data/basemetals/recipes/copper_arrow.json index 983efcc34..aeb80fbcb 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/copper_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:copper_arrow" + "id": "basemetals:copper_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_arrow_recycling.json index 3c04945fe..8e9b0784d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_arrow" }, "result": { - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_axe.json b/src/generated/resources/data/basemetals/recipes/copper_axe.json index 55a862060..c811aeb21 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_axe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:copper_axe" + "id": "basemetals:copper_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json index a76504b18..c71fdf1e2 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars.json b/src/generated/resources/data/basemetals/recipes/copper_bars.json index 1cc34e3fd..cf88d2057 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bars.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:copper_bars" + "id": "basemetals:copper_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars_2.json b/src/generated/resources/data/basemetals/recipes/copper_bars_2.json index 6063b73d3..3e5fed29c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:copper_bars" + "id": "basemetals:copper_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_bars_recycling.json index 1af67ed62..5a28d1662 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_block.json b/src/generated/resources/data/basemetals/recipes/copper_block.json index 2d93bf579..2daeb772e 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block.json +++ b/src/generated/resources/data/basemetals/recipes/copper_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:copper_block" + "id": "basemetals:copper_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_block_crushing.json b/src/generated/resources/data/basemetals/recipes/copper_block_crushing.json index 94cc3f8e9..b61ba00e2 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/copper_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:copper_powder" + "id": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json b/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json index b7fd51c74..5a42d9913 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bolt.json b/src/generated/resources/data/basemetals/recipes/copper_bolt.json index 553554acb..7a9a7aa40 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:copper_bolt" + "id": "basemetals:copper_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_bolt_recycling.json index 59c7578f6..6ede92691 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_boots.json b/src/generated/resources/data/basemetals/recipes/copper_boots.json index ee92fcd41..ee5bd2067 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_boots.json +++ b/src/generated/resources/data/basemetals/recipes/copper_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:copper_boots" + "id": "basemetals:copper_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json index dd1528386..950d3de73 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bow.json b/src/generated/resources/data/basemetals/recipes/copper_bow.json index 143f89e85..9ce76fbb8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bow.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:copper_bow" + "id": "basemetals:copper_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json index cdf8e8a71..f472f6877 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_bow" }, "result": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_button.json b/src/generated/resources/data/basemetals/recipes/copper_button.json index 775b07405..6aaac0dce 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_button.json +++ b/src/generated/resources/data/basemetals/recipes/copper_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:copper_button" + "id": "basemetals:copper_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_button_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_button_recycling.json index d6c12d51e..de0ceec67 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_chestplate.json b/src/generated/resources/data/basemetals/recipes/copper_chestplate.json index 92b363273..0c605ff71 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/copper_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:copper_chestplate" + "id": "basemetals:copper_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json index f27b434c4..3555c81bd 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json b/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json index 31409666a..dfeb5d840 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:copper_crackhammer" + "id": "basemetals:copper_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json index 6fc829ad2..066667ed8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_crackhammer" }, "result": { - "item": "basemetals:copper_block" + "id": "basemetals:copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_crossbow.json b/src/generated/resources/data/basemetals/recipes/copper_crossbow.json index b48381cc7..fa46472c2 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/copper_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:copper_crossbow" + "id": "basemetals:copper_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json index a5ba41dd4..aff66cad8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_door.json b/src/generated/resources/data/basemetals/recipes/copper_door.json index 0e10526b5..8049dd7c1 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_door.json +++ b/src/generated/resources/data/basemetals/recipes/copper_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:copper_door" + "id": "basemetals:copper_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_door_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_door_recycling.json index 0676140b5..af187cd28 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json b/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json index 2964ca4b4..328b0cff8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:copper_fishing_rod" + "id": "basemetals:copper_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_gear.json b/src/generated/resources/data/basemetals/recipes/copper_gear.json index 14c29c2e5..b01baf1dd 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_gear.json +++ b/src/generated/resources/data/basemetals/recipes/copper_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:copper_gear" + "id": "basemetals:copper_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json index 62a54926a..b93bf15a6 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_gear" }, "result": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_helmet.json b/src/generated/resources/data/basemetals/recipes/copper_helmet.json index 5fea52dad..35b74d5d9 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/copper_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:copper_helmet" + "id": "basemetals:copper_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json index e41987044..f355fc5a5 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_hoe.json b/src/generated/resources/data/basemetals/recipes/copper_hoe.json index 1c2f3626d..cff971281 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:copper_hoe" + "id": "basemetals:copper_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json index f0b4a5628..bed7c84aa 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json b/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json index a9fa6a4e9..a1a0a9b94 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:copper_horse_armor" + "id": "basemetals:copper_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/copper_ingot_crushing.json index cb493631a..4df5fb99c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/copper_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/copper" }, "result": { - "item": "basemetals:copper_powder" + "id": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json index aa8fc70d5..d2d6d8be6 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_leggings.json b/src/generated/resources/data/basemetals/recipes/copper_leggings.json index d937736bb..1ee288296 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/copper_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:copper_leggings" + "id": "basemetals:copper_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json index 3fbede89b..1ec9e356b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_lever.json b/src/generated/resources/data/basemetals/recipes/copper_lever.json index bf6a53236..ab97166e7 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_lever.json +++ b/src/generated/resources/data/basemetals/recipes/copper_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:copper_lever" + "id": "basemetals:copper_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json index 29451dda4..cf2c3c884 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_lever" }, "result": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/copper_nugget_crushing.json index 1bcf71ce5..019042fc8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/copper_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/copper" }, "result": { - "item": "basemetals:copper_smallpowder" + "id": "basemetals:copper_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_nuggets.json b/src/generated/resources/data/basemetals/recipes/copper_nuggets.json index 1a907ec50..9eb3a58f3 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/copper_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json index f227b1f49..b4732b8a4 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/copper_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/copper" }, - "result": "basemetals:copper_ingot" + "result": { + "id": "basemetals:copper_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/copper_ore_crushing.json index 8d7b738bf..01142db84 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/copper_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_powder" + "id": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json index e94bb9c09..62d840a25 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/copper_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/copper" }, - "result": "basemetals:copper_ingot" + "result": { + "id": "basemetals:copper_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json b/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json index 837d98b57..d76619ae3 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:copper_pickaxe" + "id": "basemetals:copper_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json index f6944d382..3264c4b33 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_plate.json b/src/generated/resources/data/basemetals/recipes/copper_plate.json index 2f28b782c..de2315ebe 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_plate.json +++ b/src/generated/resources/data/basemetals/recipes/copper_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:copper_plate" + "id": "basemetals:copper_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json index d2414ddd2..edaaa047e 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_plate" }, "result": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json index fcb3a0f2d..fa331ec05 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:copper_powder" + "id": "basemetals:copper_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json index ef36fa323..3fcbe4901 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/copper_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/copper" }, - "result": "basemetals:copper_ingot" + "result": { + "id": "basemetals:copper_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json index 26f3222d9..75a80a8bc 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:copper_pressure_plate" + "id": "basemetals:copper_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json index 1d776cb6d..f6e4131db 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/copper_raw_crushing.json index 5a60ef894..ebc7edfb1 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/copper_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/copper" }, "result": { - "item": "basemetals:copper_powder" + "id": "basemetals:copper_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_rod.json b/src/generated/resources/data/basemetals/recipes/copper_rod.json index 2d6fa64d1..de4ea3f4d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_rod.json +++ b/src/generated/resources/data/basemetals/recipes/copper_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:copper_rod" + "id": "basemetals:copper_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_rod_recycling.json index 650847c87..3217c5aa9 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_scythe.json b/src/generated/resources/data/basemetals/recipes/copper_scythe.json index 57ab71609..6563eee1d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:copper_scythe" + "id": "basemetals:copper_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_shears.json b/src/generated/resources/data/basemetals/recipes/copper_shears.json index f7269bb11..d3cfff20c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shears.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:copper_shears" + "id": "basemetals:copper_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json index 2de07dc91..f0c975f25 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_shield.json b/src/generated/resources/data/basemetals/recipes/copper_shield.json index 80b529201..168211a1f 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shield.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:copper_shield" + "id": "basemetals:copper_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_shovel.json b/src/generated/resources/data/basemetals/recipes/copper_shovel.json index 815963af2..6e9d9218c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:copper_shovel" + "id": "basemetals:copper_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json index 9297b51f3..f50cce6b0 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_shovel" }, "result": { - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_slab.json b/src/generated/resources/data/basemetals/recipes/copper_slab.json index c2d1ace58..955a8d03c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_slab.json +++ b/src/generated/resources/data/basemetals/recipes/copper_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:copper_slab" + "id": "basemetals:copper_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json index d5cacf6e3..3fa96b9b3 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:copper_nugget" + "id": "basemetals:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json b/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json index bcd32a051..55d0d3299 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:copper_smallpowder" + "id": "basemetals:copper_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/copper_smallpowder_smelting.json index 00e146869..4ea8ba9bc 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/copper_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/copper" }, - "result": "basemetals:copper_nugget" + "result": { + "id": "basemetals:copper_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_stairs.json b/src/generated/resources/data/basemetals/recipes/copper_stairs.json index ee109e039..1e290036a 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/copper_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:copper_stairs" + "id": "basemetals:copper_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_sword.json b/src/generated/resources/data/basemetals/recipes/copper_sword.json index 1096b3683..bd52670db 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_sword.json +++ b/src/generated/resources/data/basemetals/recipes/copper_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:copper_sword" + "id": "basemetals:copper_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json index f1c8639f8..ff473f15b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json b/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json index 0634ac4ac..617ec2691 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:copper_trapdoor" + "id": "basemetals:copper_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json index 5491f6f49..e1b69c519 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:copper_ingot" + "id": "basemetals:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_wall.json b/src/generated/resources/data/basemetals/recipes/copper_wall.json index 240bbf192..c464b1f70 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_wall.json +++ b/src/generated/resources/data/basemetals/recipes/copper_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:copper_wall" + "id": "basemetals:copper_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json index bea29e8cc..6ea26e3d5 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/copper_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:copper_wall" }, "result": { - "item": "basemetals:copper_block" + "id": "basemetals:copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json b/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json index cc1817dac..38275c790 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_arrow" + "id": "basemetals:cupronickel_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_arrow_recycling.json index e9755bfbc..b1d648acb 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_arrow" }, "result": { - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json index d5751ae2f..1361a7f92 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:cupronickel_axe" + "id": "basemetals:cupronickel_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_axe_recycling.json index f15ae3727..212eb3e9d 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json index 79a5ac593..e49b0b62c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:cupronickel_bars" + "id": "basemetals:cupronickel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json index 9ef352ee5..7801ac298 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_bars" + "id": "basemetals:cupronickel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bars_recycling.json index 2d32b5283..18f3b94b9 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json b/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json index f34477512..116001223 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json @@ -20,7 +20,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_blend" + "id": "basemetals:cupronickel_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json index 6f8d54232..625181828 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:cupronickel_blend" + "id": "basemetals:cupronickel_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/cupronickel_blend_smelting.json index 40afe6ebe..edbc68673 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/cupronickel" }, - "result": "basemetals:cupronickel_ingot" + "result": { + "id": "basemetals:cupronickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block.json b/src/generated/resources/data/basemetals/recipes/cupronickel_block.json index 002f21b0a..c7b038559 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_block.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:cupronickel_block" + "id": "basemetals:cupronickel_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block_crushing.json b/src/generated/resources/data/basemetals/recipes/cupronickel_block_crushing.json index fcca52669..3b7ced3eb 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:cupronickel_powder" + "id": "basemetals:cupronickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json index 117f6311b..c131bf1aa 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json index 4f76b77e4..de0e5779d 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_bolt" + "id": "basemetals:cupronickel_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bolt_recycling.json index e0c83a0b1..a6d050f3c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json b/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json index 8b84a12e0..455e9d0a7 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:cupronickel_boots" + "id": "basemetals:cupronickel_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_boots_recycling.json index 07bf6db5b..a3f1b5396 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json index 0bfd7a695..61be74be5 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:cupronickel_bow" + "id": "basemetals:cupronickel_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bow_recycling.json index 5af7e6c3d..44dc1320f 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_bow" }, "result": { - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_button.json b/src/generated/resources/data/basemetals/recipes/cupronickel_button.json index 04213f573..e6cfaf279 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_button.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:cupronickel_button" + "id": "basemetals:cupronickel_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_button_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_button_recycling.json index b49d7c098..64dd9b3db 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json index 33662c8e5..ba67b90c2 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:cupronickel_chestplate" + "id": "basemetals:cupronickel_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_recycling.json index 94e254905..a8a498055 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json index ac53a041a..7abd885d1 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:cupronickel_crackhammer" + "id": "basemetals:cupronickel_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer_recycling.json index 6b285df55..f2b0a66ef 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_crackhammer" }, "result": { - "item": "basemetals:cupronickel_block" + "id": "basemetals:cupronickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json index 2d9621ce3..20f729dc1 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:cupronickel_crossbow" + "id": "basemetals:cupronickel_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow_recycling.json index 487f2836e..d15d6256d 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_door.json b/src/generated/resources/data/basemetals/recipes/cupronickel_door.json index c7f74a350..32f86b9b4 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_door.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:cupronickel_door" + "id": "basemetals:cupronickel_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_door_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_door_recycling.json index 299cd0ad9..ee49a00e1 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json index 15f03e89a..2d68baa6e 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:cupronickel_fishing_rod" + "id": "basemetals:cupronickel_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json b/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json index d3e7ad57f..d4c36b18c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_gear" + "id": "basemetals:cupronickel_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_gear_recycling.json index 1dd1903b9..9d22051e8 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_gear" }, "result": { - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json b/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json index 93566e67d..1a5b30563 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:cupronickel_helmet" + "id": "basemetals:cupronickel_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_helmet_recycling.json index b4afe6392..61319f181 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json index a7798588d..2212657b1 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:cupronickel_hoe" + "id": "basemetals:cupronickel_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_hoe_recycling.json index 41a702cb1..e1c31c5ea 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json index 0266531a1..b236f46fd 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:cupronickel_horse_armor" + "id": "basemetals:cupronickel_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_crushing.json index c36600c9a..3148e0b51 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/cupronickel" }, "result": { - "item": "basemetals:cupronickel_powder" + "id": "basemetals:cupronickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json index 06165f31c..d608b23b8 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json b/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json index 0a693fe53..8b4201a35 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:cupronickel_leggings" + "id": "basemetals:cupronickel_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_leggings_recycling.json index b17bc8c85..bbd5dc0b8 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json b/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json index 8b26558a5..9af5b6aea 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:cupronickel_lever" + "id": "basemetals:cupronickel_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_lever_recycling.json index 0b9b68be7..6dd3033ae 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_lever" }, "result": { - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/cupronickel_nugget_crushing.json index 881f95bec..ffb8014a3 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/cupronickel" }, "result": { - "item": "basemetals:cupronickel_smallpowder" + "id": "basemetals:cupronickel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json index 6696d08c1..8feca4c84 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json index 551eb7524..4d5e7ade3 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:cupronickel_pickaxe" + "id": "basemetals:cupronickel_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe_recycling.json index af975d8ce..182ebfd72 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json b/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json index f26e7378c..af63bc3a5 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:cupronickel_plate" + "id": "basemetals:cupronickel_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_plate_recycling.json index 1bcd89b52..af477753c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_plate" }, "result": { - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json index e3d27bb16..b1a3390f3 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:cupronickel_powder" + "id": "basemetals:cupronickel_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/cupronickel_powder_smelting.json index 6bad0e5c9..540427b67 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/cupronickel" }, - "result": "basemetals:cupronickel_ingot" + "result": { + "id": "basemetals:cupronickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json index 44fd973db..5a997808c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:cupronickel_pressure_plate" + "id": "basemetals:cupronickel_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate_recycling.json index 0524b78f5..40b99f58f 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json b/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json index 347958beb..eafacb444 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_rod" + "id": "basemetals:cupronickel_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_rod_recycling.json index 93e308cbb..3f66d82f3 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json index 3163d2b0f..31bc23646 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:cupronickel_scythe" + "id": "basemetals:cupronickel_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json index 77f5a2c46..89f2615c0 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:cupronickel_shears" + "id": "basemetals:cupronickel_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shears_recycling.json index 39342f202..ccef194f5 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json index d599c92c8..dcbc36b12 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:cupronickel_shield" + "id": "basemetals:cupronickel_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json index 83f12499f..806df8807 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:cupronickel_shovel" + "id": "basemetals:cupronickel_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shovel_recycling.json index 639b95555..f19b553c3 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_shovel" }, "result": { - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json b/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json index 60aab8a7d..5c6210479 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:cupronickel_slab" + "id": "basemetals:cupronickel_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_slab_recycling.json index a50f2e9f2..e04990399 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:cupronickel_nugget" + "id": "basemetals:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json index b09bf3dd7..032e1fa8b 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:cupronickel_smallblend" + "id": "basemetals:cupronickel_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend_smelting.json index 6e922be92..5e8f95cea 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/cupronickel" }, - "result": "basemetals:cupronickel_nugget" + "result": { + "id": "basemetals:cupronickel_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json index 23b2c93f2..85fe0f79b 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:cupronickel_smallpowder" + "id": "basemetals:cupronickel_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder_smelting.json index c2c53cbd0..0b7c9eccb 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/cupronickel" }, - "result": "basemetals:cupronickel_nugget" + "result": { + "id": "basemetals:cupronickel_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json b/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json index 7dd2a1d92..89ce730c6 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:cupronickel_stairs" + "id": "basemetals:cupronickel_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json b/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json index 8ea6a8bb2..8878e7493 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:cupronickel_sword" + "id": "basemetals:cupronickel_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_sword_recycling.json index 28cef157d..08c871b7c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json index 1ee68c9a3..c282f5751 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:cupronickel_trapdoor" + "id": "basemetals:cupronickel_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor_recycling.json index 6d7f63b23..f5db025bc 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:cupronickel_ingot" + "id": "basemetals:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json b/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json index c21eed27c..8e97835c6 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:cupronickel_wall" + "id": "basemetals:cupronickel_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/cupronickel_wall_recycling.json index 3bb8fba25..dadf6d53d 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:cupronickel_wall" }, "result": { - "item": "basemetals:cupronickel_block" + "id": "basemetals:cupronickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/dark_prismarine_crushing.json b/src/generated/resources/data/basemetals/recipes/dark_prismarine_crushing.json index 89d7094c8..627ff36d5 100644 --- a/src/generated/resources/data/basemetals/recipes/dark_prismarine_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/dark_prismarine_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 8, - "item": "minecraft:prismarine_shard" + "id": "minecraft:prismarine_shard" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/detector_rail.json b/src/generated/resources/data/basemetals/recipes/detector_rail.json index 3c6ad871e..0f1398d1f 100644 --- a/src/generated/resources/data/basemetals/recipes/detector_rail.json +++ b/src/generated/resources/data/basemetals/recipes/detector_rail.json @@ -21,7 +21,7 @@ "XRX" ], "result": { - "item": "minecraft:detector_rail" + "id": "minecraft:detector_rail" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_arrow.json b/src/generated/resources/data/basemetals/recipes/diamond_arrow.json index 0a5bc28b2..0fa33d8ed 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:diamond_arrow" + "id": "basemetals:diamond_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_arrow_recycling.json index 1787ac427..d079d8c9a 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:diamond_arrow" }, "result": { - "item": "basemetals:diamond_nugget" + "id": "basemetals:diamond_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars.json b/src/generated/resources/data/basemetals/recipes/diamond_bars.json index d5211aaed..f9ed129f2 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bars.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:diamond_bars" + "id": "basemetals:diamond_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json b/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json index c7866e009..ae795ddf9 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:diamond_bars" + "id": "basemetals:diamond_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_bars_recycling.json index 393188100..60fe017df 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:diamond_nugget" + "id": "basemetals:diamond_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_block_crushing.json b/src/generated/resources/data/basemetals/recipes/diamond_block_crushing.json index fbed9eb13..b16ca328f 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:diamond_powder" + "id": "basemetals:diamond_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bolt.json b/src/generated/resources/data/basemetals/recipes/diamond_bolt.json index d253260a3..4123cd348 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:diamond_bolt" + "id": "basemetals:diamond_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_bolt_recycling.json index 610422846..2c97a440a 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:diamond_nugget" + "id": "basemetals:diamond_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bow.json b/src/generated/resources/data/basemetals/recipes/diamond_bow.json index 62cce5b77..e9b975a7d 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bow.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:diamond_bow" + "id": "basemetals:diamond_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_bow_recycling.json index 71a6492b0..d10f6255e 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:diamond_bow" }, "result": { - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_button.json b/src/generated/resources/data/basemetals/recipes/diamond_button.json index 9bc200c75..a6b668e3b 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_button.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:diamond_button" + "id": "basemetals:diamond_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_button_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_button_recycling.json index d49987162..a0efa5f49 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:diamond_nugget" + "id": "basemetals:diamond_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json b/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json index 894f6bf19..72e1a2400 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:diamond_crackhammer" + "id": "basemetals:diamond_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_crackhammer_recycling.json index d07157736..f9f8d7022 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:diamond_crackhammer" }, "result": { - "item": "minecraft:diamond_block" + "id": "minecraft:diamond_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json b/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json index ee9cdd1da..dc76b9b4e 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:diamond_crossbow" + "id": "basemetals:diamond_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_crossbow_recycling.json index f80272ed6..379dfc0db 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crushing.json b/src/generated/resources/data/basemetals/recipes/diamond_crushing.json index 8bec8ed7c..17ab313cb 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:diamond" }, "result": { - "item": "basemetals:diamond_powder" + "id": "basemetals:diamond_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_door.json b/src/generated/resources/data/basemetals/recipes/diamond_door.json index ea78b3564..beb4ba573 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_door.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:diamond_door" + "id": "basemetals:diamond_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_door_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_door_recycling.json index cdc4d3025..b5a66fbe3 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json b/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json index 7762462d6..de29e5dfc 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:diamond_fishing_rod" + "id": "basemetals:diamond_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_gear.json b/src/generated/resources/data/basemetals/recipes/diamond_gear.json index 9ecff014f..fb7867995 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_gear.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:diamond_gear" + "id": "basemetals:diamond_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_gear_recycling.json index 3190b31e5..b5869d299 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:diamond_gear" }, "result": { - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_lever.json b/src/generated/resources/data/basemetals/recipes/diamond_lever.json index bbc5b7b7d..754900612 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_lever.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:diamond_lever" + "id": "basemetals:diamond_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_lever_recycling.json index cf2263669..50aedf238 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:diamond_lever" }, "result": { - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/diamond_nugget_crushing.json index e909bfdff..3121071c8 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/diamond" }, "result": { - "item": "basemetals:diamond_smallpowder" + "id": "basemetals:diamond_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/diamond_ore_crushing.json index db7fe2be1..5c47d2b24 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:diamond_powder" + "id": "basemetals:diamond_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json index efe50b2e5..15a5f8b76 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:diamond_powder" + "id": "basemetals:diamond_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/diamond_powder_smelting.json index 8b0f6945a..f4e8b2c5c 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/diamond" }, - "result": "minecraft:diamond" + "result": { + "id": "minecraft:diamond" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json index 28809eac7..0fc3ede37 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:diamond_pressure_plate" + "id": "basemetals:diamond_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate_recycling.json index 6072fd46b..fbee8446e 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_rod.json b/src/generated/resources/data/basemetals/recipes/diamond_rod.json index 47c79c527..a9fee2591 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_rod.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:diamond_rod" + "id": "basemetals:diamond_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_rod_recycling.json index 82ac2c820..1b2bcc7d9 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:diamond_nugget" + "id": "basemetals:diamond_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_scythe.json b/src/generated/resources/data/basemetals/recipes/diamond_scythe.json index 31f33d459..87c73596f 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:diamond_scythe" + "id": "basemetals:diamond_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shears.json b/src/generated/resources/data/basemetals/recipes/diamond_shears.json index 26d5fb509..61151c39d 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_shears.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:diamond_shears" + "id": "basemetals:diamond_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_shears_recycling.json index 9161c9964..39270eb70 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shield.json b/src/generated/resources/data/basemetals/recipes/diamond_shield.json index bd0ee038d..b027c0b19 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_shield.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:diamond_shield" + "id": "basemetals:diamond_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_slab.json b/src/generated/resources/data/basemetals/recipes/diamond_slab.json index 365a37fe0..7ad0c33f3 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_slab.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:diamond_slab" + "id": "basemetals:diamond_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_slab_recycling.json index 52d04e315..22184b37c 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:diamond_nugget" + "id": "basemetals:diamond_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/diamond_smallblend_smelting.json index ddf54ee73..4ac282940 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/diamond" }, - "result": "basemetals:diamond_nugget" + "result": { + "id": "basemetals:diamond_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json b/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json index 8b4f578a5..16e155c3a 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:diamond_smallpowder" + "id": "basemetals:diamond_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/diamond_smallpowder_smelting.json index 430b1472e..f14c15f52 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/diamond" }, - "result": "basemetals:diamond_nugget" + "result": { + "id": "basemetals:diamond_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_stairs.json b/src/generated/resources/data/basemetals/recipes/diamond_stairs.json index 28e78723a..3294be0de 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:diamond_stairs" + "id": "basemetals:diamond_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json b/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json index 5824bb238..b1ddaa0ca 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:diamond_trapdoor" + "id": "basemetals:diamond_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_trapdoor_recycling.json index 85ed731a7..5b426ead4 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:diamond" + "id": "minecraft:diamond" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_wall.json b/src/generated/resources/data/basemetals/recipes/diamond_wall.json index 5aa6f69cc..1fb4547ef 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_wall.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:diamond_wall" + "id": "basemetals:diamond_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/diamond_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/diamond_wall_recycling.json index 25501e93c..c91e3a166 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:diamond_wall" }, "result": { - "item": "minecraft:diamond_block" + "id": "minecraft:diamond_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_arrow.json b/src/generated/resources/data/basemetals/recipes/electrum_arrow.json index 63bc1162c..ad6eae2d8 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:electrum_arrow" + "id": "basemetals:electrum_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_arrow_recycling.json index d4f3c04dc..d354223c6 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_arrow" }, "result": { - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_axe.json b/src/generated/resources/data/basemetals/recipes/electrum_axe.json index d9081d651..32c70db75 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_axe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:electrum_axe" + "id": "basemetals:electrum_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_axe_recycling.json index 90541f89d..432cc0da6 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars.json b/src/generated/resources/data/basemetals/recipes/electrum_bars.json index 78499227f..367c1d114 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bars.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:electrum_bars" + "id": "basemetals:electrum_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json b/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json index a090f2c31..63be4861c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:electrum_bars" + "id": "basemetals:electrum_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_bars_recycling.json index 42356e514..768213733 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend.json b/src/generated/resources/data/basemetals/recipes/electrum_blend.json index e5bc6d699..fa1284792 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_blend.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_blend.json @@ -14,7 +14,7 @@ ], "result": { "count": 2, - "item": "basemetals:electrum_blend" + "id": "basemetals:electrum_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json index b181829c1..e4bc15f10 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:electrum_blend" + "id": "basemetals:electrum_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/electrum_blend_smelting.json index 6e2291bc8..25da561ed 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/electrum" }, - "result": "basemetals:electrum_ingot" + "result": { + "id": "basemetals:electrum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block.json b/src/generated/resources/data/basemetals/recipes/electrum_block.json index 273701614..b3e2f1c7c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_block.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:electrum_block" + "id": "basemetals:electrum_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block_crushing.json b/src/generated/resources/data/basemetals/recipes/electrum_block_crushing.json index 94f3ba4a2..ae1aebd99 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:electrum_powder" + "id": "basemetals:electrum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json b/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json index e48c16e3b..1bc61a0df 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bolt.json b/src/generated/resources/data/basemetals/recipes/electrum_bolt.json index 192a1016d..da744a6c4 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:electrum_bolt" + "id": "basemetals:electrum_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_bolt_recycling.json index b4b972517..c19ad2552 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_boots.json b/src/generated/resources/data/basemetals/recipes/electrum_boots.json index 0a3689850..b9e442ed3 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_boots.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:electrum_boots" + "id": "basemetals:electrum_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_boots_recycling.json index a4bdf6969..0646d47c4 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bow.json b/src/generated/resources/data/basemetals/recipes/electrum_bow.json index 15ba37d48..6d6fc5846 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bow.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:electrum_bow" + "id": "basemetals:electrum_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_bow_recycling.json index efd07b5f3..0843e63f7 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_bow" }, "result": { - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_button.json b/src/generated/resources/data/basemetals/recipes/electrum_button.json index eef9fdc05..c4cd2ad1f 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_button.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:electrum_button" + "id": "basemetals:electrum_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_button_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_button_recycling.json index 5ffa07fd0..3bccf9610 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json b/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json index db90c1649..d96643f2c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:electrum_chestplate" + "id": "basemetals:electrum_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_chestplate_recycling.json index 37d3108b8..44045727f 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json b/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json index 2c545e893..f4d7a70dd 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:electrum_crackhammer" + "id": "basemetals:electrum_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_crackhammer_recycling.json index 8fdf9d954..4fe457c88 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_crackhammer" }, "result": { - "item": "basemetals:electrum_block" + "id": "basemetals:electrum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json b/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json index 37111bed4..873e83039 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:electrum_crossbow" + "id": "basemetals:electrum_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_crossbow_recycling.json index 8364cb85e..7fa66791c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_door.json b/src/generated/resources/data/basemetals/recipes/electrum_door.json index a6d62e382..488f09587 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_door.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:electrum_door" + "id": "basemetals:electrum_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_door_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_door_recycling.json index d6e0db550..f1c6a8ac5 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json b/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json index e8d028016..24515adc7 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:electrum_fishing_rod" + "id": "basemetals:electrum_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_gear.json b/src/generated/resources/data/basemetals/recipes/electrum_gear.json index 66a9524cf..39527e0f6 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_gear.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:electrum_gear" + "id": "basemetals:electrum_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_gear_recycling.json index b672a4c9b..261c7f7da 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_gear" }, "result": { - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_helmet.json b/src/generated/resources/data/basemetals/recipes/electrum_helmet.json index f0a475e3b..fa43418c8 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:electrum_helmet" + "id": "basemetals:electrum_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_helmet_recycling.json index d72770bf8..2b1358c1e 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_hoe.json b/src/generated/resources/data/basemetals/recipes/electrum_hoe.json index b552b9f99..5bddd3fcb 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:electrum_hoe" + "id": "basemetals:electrum_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_hoe_recycling.json index b94e9f905..b6cc661e6 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json b/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json index 9ee243c5c..c9154e581 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:electrum_horse_armor" + "id": "basemetals:electrum_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/electrum_ingot_crushing.json index 074b21d50..5607b2ed2 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/electrum" }, "result": { - "item": "basemetals:electrum_powder" + "id": "basemetals:electrum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json index ab2e56d4b..fa9da7cbc 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_leggings.json b/src/generated/resources/data/basemetals/recipes/electrum_leggings.json index 57682a467..90e588732 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:electrum_leggings" + "id": "basemetals:electrum_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_leggings_recycling.json index b8078a472..f49cff406 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_lever.json b/src/generated/resources/data/basemetals/recipes/electrum_lever.json index 90e9ec70d..78af4102b 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_lever.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:electrum_lever" + "id": "basemetals:electrum_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_lever_recycling.json index b7f666dff..ab8048985 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_lever" }, "result": { - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/electrum_nugget_crushing.json index 5baf564a0..d2da24d95 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/electrum" }, "result": { - "item": "basemetals:electrum_smallpowder" + "id": "basemetals:electrum_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json b/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json index 7175dd84f..0c3a1ba31 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json b/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json index ff24ee176..3e5d8c15c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:electrum_pickaxe" + "id": "basemetals:electrum_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_pickaxe_recycling.json index ebe41c7fe..60d8b1606 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_plate.json b/src/generated/resources/data/basemetals/recipes/electrum_plate.json index 57564e599..09447f63a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_plate.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:electrum_plate" + "id": "basemetals:electrum_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_plate_recycling.json index c4c326608..3eb6e24fa 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_plate" }, "result": { - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json index 84ceb8e2e..829387831 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:electrum_powder" + "id": "basemetals:electrum_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/electrum_powder_smelting.json index 1e72e36c3..55f147b2c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/electrum" }, - "result": "basemetals:electrum_ingot" + "result": { + "id": "basemetals:electrum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json index 97ccf4313..e533c3e01 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:electrum_pressure_plate" + "id": "basemetals:electrum_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate_recycling.json index d8cd02702..aedc0ba3c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_rod.json b/src/generated/resources/data/basemetals/recipes/electrum_rod.json index ed388e17d..86292d2d4 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_rod.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:electrum_rod" + "id": "basemetals:electrum_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_rod_recycling.json index 8c2a623cc..aa97de8a2 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_scythe.json b/src/generated/resources/data/basemetals/recipes/electrum_scythe.json index ec3f81b7c..30c34d620 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:electrum_scythe" + "id": "basemetals:electrum_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shears.json b/src/generated/resources/data/basemetals/recipes/electrum_shears.json index c9818cfdb..8afa77a25 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shears.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:electrum_shears" + "id": "basemetals:electrum_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_shears_recycling.json index d7e7cf676..94aae43f9 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shield.json b/src/generated/resources/data/basemetals/recipes/electrum_shield.json index e2cbc5df7..692271d9a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shield.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:electrum_shield" + "id": "basemetals:electrum_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shovel.json b/src/generated/resources/data/basemetals/recipes/electrum_shovel.json index 9c7fe615e..8bbf0d578 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:electrum_shovel" + "id": "basemetals:electrum_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_shovel_recycling.json index 5370609b8..5b1809dee 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_shovel" }, "result": { - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_slab.json b/src/generated/resources/data/basemetals/recipes/electrum_slab.json index de35cb5ec..113dc341a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_slab.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:electrum_slab" + "id": "basemetals:electrum_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_slab_recycling.json index 9c18835ba..b4fe87700 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:electrum_nugget" + "id": "basemetals:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json b/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json index 596b12b70..c8a559bd3 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:electrum_smallblend" + "id": "basemetals:electrum_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/electrum_smallblend_smelting.json index 4bed5bd1b..e88d378c8 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/electrum" }, - "result": "basemetals:electrum_nugget" + "result": { + "id": "basemetals:electrum_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json b/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json index d0459ea60..30b8fd050 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:electrum_smallpowder" + "id": "basemetals:electrum_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/electrum_smallpowder_smelting.json index 7dd2b1a75..96304c5c0 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/electrum" }, - "result": "basemetals:electrum_nugget" + "result": { + "id": "basemetals:electrum_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_stairs.json b/src/generated/resources/data/basemetals/recipes/electrum_stairs.json index c82c90b4d..5ddd160a9 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:electrum_stairs" + "id": "basemetals:electrum_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_sword.json b/src/generated/resources/data/basemetals/recipes/electrum_sword.json index cd9338f08..2906f3c44 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_sword.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:electrum_sword" + "id": "basemetals:electrum_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_sword_recycling.json index be3f5ad06..8d76d6bc8 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json b/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json index 465f2ece7..90c83488b 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:electrum_trapdoor" + "id": "basemetals:electrum_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_trapdoor_recycling.json index 49ead271f..ab2247f9a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:electrum_ingot" + "id": "basemetals:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_wall.json b/src/generated/resources/data/basemetals/recipes/electrum_wall.json index 8a0235cde..cbbb4d52f 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_wall.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:electrum_wall" + "id": "basemetals:electrum_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/electrum_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/electrum_wall_recycling.json index a04090be6..40b5b8896 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:electrum_wall" }, "result": { - "item": "basemetals:electrum_block" + "id": "basemetals:electrum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_arrow.json b/src/generated/resources/data/basemetals/recipes/emerald_arrow.json index 1ca2766d1..67fcc9502 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:emerald_arrow" + "id": "basemetals:emerald_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_arrow_recycling.json index 742ca43b9..809c38629 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_arrow" }, "result": { - "item": "basemetals:emerald_nugget" + "id": "basemetals:emerald_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_axe.json b/src/generated/resources/data/basemetals/recipes/emerald_axe.json index c067c5974..dca948106 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_axe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:emerald_axe" + "id": "basemetals:emerald_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_axe_recycling.json index 8937d2c3d..0d60c371c 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars.json b/src/generated/resources/data/basemetals/recipes/emerald_bars.json index 48725412c..d966c48b5 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bars.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:emerald_bars" + "id": "basemetals:emerald_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json b/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json index da899482e..538bdcb75 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:emerald_bars" + "id": "basemetals:emerald_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_bars_recycling.json index 41e701d24..e2431f0eb 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:emerald_nugget" + "id": "basemetals:emerald_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_block_crushing.json b/src/generated/resources/data/basemetals/recipes/emerald_block_crushing.json index 46c4f6780..d35a20c5b 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:emerald_powder" + "id": "basemetals:emerald_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bolt.json b/src/generated/resources/data/basemetals/recipes/emerald_bolt.json index f5d6dbe05..1f282000e 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:emerald_bolt" + "id": "basemetals:emerald_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_bolt_recycling.json index c6199380a..e531df5d9 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:emerald_nugget" + "id": "basemetals:emerald_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_boots.json b/src/generated/resources/data/basemetals/recipes/emerald_boots.json index db618d6f6..fc3b26660 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_boots.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:emerald_boots" + "id": "basemetals:emerald_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_boots_recycling.json index 6fc3a95fe..002617033 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bow.json b/src/generated/resources/data/basemetals/recipes/emerald_bow.json index 6ba87bc65..82d984bbe 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bow.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:emerald_bow" + "id": "basemetals:emerald_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_bow_recycling.json index dadeb9d67..1a34c16bb 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_bow" }, "result": { - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_button.json b/src/generated/resources/data/basemetals/recipes/emerald_button.json index e61176643..d81fb9421 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_button.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:emerald_button" + "id": "basemetals:emerald_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_button_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_button_recycling.json index 292db2230..47be53d08 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:emerald_nugget" + "id": "basemetals:emerald_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json b/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json index 215d149c1..3665bf06b 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:emerald_chestplate" + "id": "basemetals:emerald_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_chestplate_recycling.json index 967c998b4..91f717b21 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json b/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json index 35f8c8278..51b17afd0 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:emerald_crackhammer" + "id": "basemetals:emerald_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_crackhammer_recycling.json index ccfe99e3b..16e64c92c 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_crackhammer" }, "result": { - "item": "minecraft:emerald_block" + "id": "minecraft:emerald_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json b/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json index 47df9a971..89ab692cb 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:emerald_crossbow" + "id": "basemetals:emerald_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_crossbow_recycling.json index de3e17dd4..db336fe9d 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crushing.json b/src/generated/resources/data/basemetals/recipes/emerald_crushing.json index 885586cfc..684cb7959 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:emerald" }, "result": { - "item": "basemetals:emerald_powder" + "id": "basemetals:emerald_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_door.json b/src/generated/resources/data/basemetals/recipes/emerald_door.json index 7678d3117..11c49f068 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_door.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:emerald_door" + "id": "basemetals:emerald_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_door_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_door_recycling.json index 81f16df56..318374f1f 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json b/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json index 393094c89..a7ce3eb64 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:emerald_fishing_rod" + "id": "basemetals:emerald_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_gear.json b/src/generated/resources/data/basemetals/recipes/emerald_gear.json index a3edb2d75..3950285c8 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_gear.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:emerald_gear" + "id": "basemetals:emerald_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_gear_recycling.json index f6e1ee2d5..282b53f7b 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_gear" }, "result": { - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_helmet.json b/src/generated/resources/data/basemetals/recipes/emerald_helmet.json index b19c62738..0d8428413 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:emerald_helmet" + "id": "basemetals:emerald_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_helmet_recycling.json index e7f0063af..48ceb5285 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_hoe.json b/src/generated/resources/data/basemetals/recipes/emerald_hoe.json index 58dd557e3..e9a6f8f00 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:emerald_hoe" + "id": "basemetals:emerald_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_hoe_recycling.json index ff0536347..7cb92ed28 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json b/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json index f87eb80e2..1ae16d70a 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:emerald_horse_armor" + "id": "basemetals:emerald_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_leggings.json b/src/generated/resources/data/basemetals/recipes/emerald_leggings.json index 003ead98a..f6cabc627 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:emerald_leggings" + "id": "basemetals:emerald_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_leggings_recycling.json index 159ed3879..e20db95e0 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_lever.json b/src/generated/resources/data/basemetals/recipes/emerald_lever.json index 14370c568..e0d23b18c 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_lever.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:emerald_lever" + "id": "basemetals:emerald_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_lever_recycling.json index f04cefd46..eec4bd932 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_lever" }, "result": { - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/emerald_nugget_crushing.json index 6d575047f..4c1f7e18a 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/emerald" }, "result": { - "item": "basemetals:emerald_smallpowder" + "id": "basemetals:emerald_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/emerald_ore_crushing.json index 787cc517f..39c59f955 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:emerald_powder" + "id": "basemetals:emerald_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json b/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json index 6165932cb..39ea517fa 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:emerald_pickaxe" + "id": "basemetals:emerald_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_pickaxe_recycling.json index 686b3311b..ca3086d00 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json index 95739d844..cbb9050d5 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:emerald_powder" + "id": "basemetals:emerald_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/emerald_powder_smelting.json index ca1306715..31a1a0bd6 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/emerald" }, - "result": "minecraft:emerald" + "result": { + "id": "minecraft:emerald" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json index 33e09a6a5..86921e3d4 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:emerald_pressure_plate" + "id": "basemetals:emerald_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate_recycling.json index a7cf39492..bb487f818 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_rod.json b/src/generated/resources/data/basemetals/recipes/emerald_rod.json index bf42ece49..9c1246ea4 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_rod.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:emerald_rod" + "id": "basemetals:emerald_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_rod_recycling.json index 98d94d0f4..8b3609385 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:emerald_nugget" + "id": "basemetals:emerald_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_scythe.json b/src/generated/resources/data/basemetals/recipes/emerald_scythe.json index a1631a267..a02ec23a0 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:emerald_scythe" + "id": "basemetals:emerald_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shears.json b/src/generated/resources/data/basemetals/recipes/emerald_shears.json index 5f7824a02..cebae4184 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shears.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:emerald_shears" + "id": "basemetals:emerald_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_shears_recycling.json index 1cbbe7341..720249e95 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shield.json b/src/generated/resources/data/basemetals/recipes/emerald_shield.json index ff2a7ea92..ea9038967 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shield.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:emerald_shield" + "id": "basemetals:emerald_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shovel.json b/src/generated/resources/data/basemetals/recipes/emerald_shovel.json index cc9f760b8..f335c6c7a 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:emerald_shovel" + "id": "basemetals:emerald_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_shovel_recycling.json index 9ba78ad01..f665ec316 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_shovel" }, "result": { - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_slab.json b/src/generated/resources/data/basemetals/recipes/emerald_slab.json index ef45bd11d..755105555 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_slab.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:emerald_slab" + "id": "basemetals:emerald_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_slab_recycling.json index e4f04475d..b48c90b95 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:emerald_nugget" + "id": "basemetals:emerald_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json b/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json index b77686793..acf561d79 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:emerald_smallpowder" + "id": "basemetals:emerald_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/emerald_smallpowder_smelting.json index 5b16eeb23..4ec37b9a6 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/emerald" }, - "result": "basemetals:emerald_nugget" + "result": { + "id": "basemetals:emerald_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_stairs.json b/src/generated/resources/data/basemetals/recipes/emerald_stairs.json index 4723a177b..3bf4a85d3 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:emerald_stairs" + "id": "basemetals:emerald_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_sword.json b/src/generated/resources/data/basemetals/recipes/emerald_sword.json index e974db26e..062a86961 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_sword.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:emerald_sword" + "id": "basemetals:emerald_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_sword_recycling.json index e2b2988d3..5354c7bc8 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json b/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json index 45f3f2135..9b84f21f3 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:emerald_trapdoor" + "id": "basemetals:emerald_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_trapdoor_recycling.json index fced74097..54e36846e 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_wall.json b/src/generated/resources/data/basemetals/recipes/emerald_wall.json index 8f0417ef7..cd05d67c5 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_wall.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:emerald_wall" + "id": "basemetals:emerald_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/emerald_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/emerald_wall_recycling.json index caac1d9ef..ffa2808e3 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:emerald_wall" }, "result": { - "item": "minecraft:emerald_block" + "id": "minecraft:emerald_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/flint_and_steel.json b/src/generated/resources/data/basemetals/recipes/flint_and_steel.json index 65134a1e4..50fb52e08 100644 --- a/src/generated/resources/data/basemetals/recipes/flint_and_steel.json +++ b/src/generated/resources/data/basemetals/recipes/flint_and_steel.json @@ -13,7 +13,7 @@ } ], "result": { - "item": "minecraft:flint_and_steel" + "id": "minecraft:flint_and_steel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/glass_crushing.json b/src/generated/resources/data/basemetals/recipes/glass_crushing.json index 0a10f5e0a..eaef557e6 100644 --- a/src/generated/resources/data/basemetals/recipes/glass_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/glass_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:glass" }, "result": { - "item": "minecraft:sand" + "id": "minecraft:sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/glowstone_crushing.json b/src/generated/resources/data/basemetals/recipes/glowstone_crushing.json index 09ea13773..8bff73a4e 100644 --- a/src/generated/resources/data/basemetals/recipes/glowstone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/glowstone_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 4, - "item": "minecraft:glowstone_dust" + "id": "minecraft:glowstone_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_arrow.json b/src/generated/resources/data/basemetals/recipes/gold_arrow.json index d2159a72d..234c9529b 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/gold_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:gold_arrow" + "id": "basemetals:gold_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_arrow_recycling.json index 85afdd5d3..8000fc1fb 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_arrow" }, "result": { - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars.json b/src/generated/resources/data/basemetals/recipes/gold_bars.json index 4b78b5fad..51ed15701 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bars.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:gold_bars" + "id": "basemetals:gold_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars_2.json b/src/generated/resources/data/basemetals/recipes/gold_bars_2.json index c12cf400a..5e20f761a 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:gold_bars" + "id": "basemetals:gold_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_bars_recycling.json index ab984b102..9cd96c591 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_block_crushing.json b/src/generated/resources/data/basemetals/recipes/gold_block_crushing.json index a55ee89ce..74b66bd83 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/gold_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:gold_powder" + "id": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bolt.json b/src/generated/resources/data/basemetals/recipes/gold_bolt.json index b2aed4f47..dbc79021a 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:gold_bolt" + "id": "basemetals:gold_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_bolt_recycling.json index 6dd551dd1..40dd08147 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bow.json b/src/generated/resources/data/basemetals/recipes/gold_bow.json index a1393ca5d..a9ed112c3 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bow.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:gold_bow" + "id": "basemetals:gold_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_bow_recycling.json index cadfd143b..89473ab7f 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_bow" }, "result": { - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_button.json b/src/generated/resources/data/basemetals/recipes/gold_button.json index a6c3d6ae8..9ceb99b6d 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_button.json +++ b/src/generated/resources/data/basemetals/recipes/gold_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:gold_button" + "id": "basemetals:gold_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_button_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_button_recycling.json index bc710c7dc..29564c299 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json b/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json index 134f6c907..aef821a3b 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:gold_crackhammer" + "id": "basemetals:gold_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_crackhammer_recycling.json index 7968e2b63..2ef0fc087 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_crackhammer" }, "result": { - "item": "minecraft:gold_block" + "id": "minecraft:gold_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_crossbow.json b/src/generated/resources/data/basemetals/recipes/gold_crossbow.json index c764d843f..ab9c51bdd 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/gold_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:gold_crossbow" + "id": "basemetals:gold_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_crossbow_recycling.json index 540b51664..dc2a4ba52 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_door.json b/src/generated/resources/data/basemetals/recipes/gold_door.json index 9c97b76df..71c7c2adb 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_door.json +++ b/src/generated/resources/data/basemetals/recipes/gold_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:gold_door" + "id": "basemetals:gold_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_door_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_door_recycling.json index 02dd10dcd..b3cba165f 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json b/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json index 4a97dcefc..767d83465 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:gold_fishing_rod" + "id": "basemetals:gold_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_gear.json b/src/generated/resources/data/basemetals/recipes/gold_gear.json index 7684bba6b..b9fab9b06 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_gear.json +++ b/src/generated/resources/data/basemetals/recipes/gold_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:gold_gear" + "id": "basemetals:gold_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_gear_recycling.json index 6d10cc8ab..f561da250 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_gear" }, "result": { - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/gold_ingot_crushing.json index 4e032ed8a..7f96b38d3 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/gold_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/gold" }, "result": { - "item": "basemetals:gold_powder" + "id": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_lever.json b/src/generated/resources/data/basemetals/recipes/gold_lever.json index d72bfbbcc..7135a2fcc 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_lever.json +++ b/src/generated/resources/data/basemetals/recipes/gold_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:gold_lever" + "id": "basemetals:gold_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_lever_recycling.json index f1edd7597..4f8c9d1c1 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_lever" }, "result": { - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/gold_nugget_crushing.json index a10d4fbd8..b19e77aab 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/gold_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/gold" }, "result": { - "item": "basemetals:gold_smallpowder" + "id": "basemetals:gold_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/gold_ore_crushing.json index 3b6429c63..59ce48929 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/gold_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:gold_powder" + "id": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_plate.json b/src/generated/resources/data/basemetals/recipes/gold_plate.json index f55f5bf37..4a148658e 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_plate.json +++ b/src/generated/resources/data/basemetals/recipes/gold_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:gold_plate" + "id": "basemetals:gold_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_plate_recycling.json index 0d27ef02a..35f9b28fd 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_plate" }, "result": { - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json index 9f7810b25..8d601295c 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:gold_powder" + "id": "basemetals:gold_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/gold_powder_smelting.json index 8a2a12eb9..ffa6ed79e 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/gold_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/gold" }, - "result": "minecraft:gold_ingot" + "result": { + "id": "minecraft:gold_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/gold_raw_crushing.json index 0721a7810..c07de81c5 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/gold_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/gold" }, "result": { - "item": "basemetals:gold_powder" + "id": "basemetals:gold_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_rod.json b/src/generated/resources/data/basemetals/recipes/gold_rod.json index 67732f552..69e60ad91 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_rod.json +++ b/src/generated/resources/data/basemetals/recipes/gold_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:gold_rod" + "id": "basemetals:gold_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_rod_recycling.json index 3d23ae6e1..9eaee0654 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_scythe.json b/src/generated/resources/data/basemetals/recipes/gold_scythe.json index 5ddbc0229..f555dc356 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/gold_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:gold_scythe" + "id": "basemetals:gold_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_shears.json b/src/generated/resources/data/basemetals/recipes/gold_shears.json index a67f27e30..51d6c6040 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_shears.json +++ b/src/generated/resources/data/basemetals/recipes/gold_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:gold_shears" + "id": "basemetals:gold_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_shears_recycling.json index f2167c79b..4c0ae8a89 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_shield.json b/src/generated/resources/data/basemetals/recipes/gold_shield.json index 04a601869..42b4ebe91 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_shield.json +++ b/src/generated/resources/data/basemetals/recipes/gold_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:gold_shield" + "id": "basemetals:gold_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_slab.json b/src/generated/resources/data/basemetals/recipes/gold_slab.json index 9aec5e3a8..96f42fc91 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_slab.json +++ b/src/generated/resources/data/basemetals/recipes/gold_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:gold_slab" + "id": "basemetals:gold_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_slab_recycling.json index acf60c8f1..049e9e175 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/gold_smallblend_smelting.json index b7f31bf9d..5b090f166 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/gold_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/gold" }, - "result": "minecraft:gold_nugget" + "result": { + "id": "minecraft:gold_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json b/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json index 90b34b0b0..1f9980fb0 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:gold_smallpowder" + "id": "basemetals:gold_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/gold_smallpowder_smelting.json index 9ed5b2919..281536ce0 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/gold_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/gold" }, - "result": "minecraft:gold_nugget" + "result": { + "id": "minecraft:gold_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_stairs.json b/src/generated/resources/data/basemetals/recipes/gold_stairs.json index 7a5f80824..a12d98c62 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/gold_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:gold_stairs" + "id": "basemetals:gold_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json b/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json index 98b1eae83..b9b191e97 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:gold_trapdoor" + "id": "basemetals:gold_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_trapdoor_recycling.json index eb6a5d233..d7481fead 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_wall.json b/src/generated/resources/data/basemetals/recipes/gold_wall.json index 0f922c151..e953d7d18 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_wall.json +++ b/src/generated/resources/data/basemetals/recipes/gold_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:gold_wall" + "id": "basemetals:gold_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gold_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/gold_wall_recycling.json index 7602a5ace..ee616b716 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/gold_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:gold_wall" }, "result": { - "item": "minecraft:gold_block" + "id": "minecraft:gold_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/gravel_crushing.json b/src/generated/resources/data/basemetals/recipes/gravel_crushing.json index 8a17a50b5..4f7476dbf 100644 --- a/src/generated/resources/data/basemetals/recipes/gravel_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/gravel_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:gravel" }, "result": { - "item": "minecraft:sand" + "id": "minecraft:sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/human_detector.json b/src/generated/resources/data/basemetals/recipes/human_detector.json index c37435cf4..9c62708d0 100644 --- a/src/generated/resources/data/basemetals/recipes/human_detector.json +++ b/src/generated/resources/data/basemetals/recipes/human_detector.json @@ -17,7 +17,7 @@ "GG" ], "result": { - "item": "basemetals:human_detector" + "id": "basemetals:human_detector" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_arrow.json b/src/generated/resources/data/basemetals/recipes/invar_arrow.json index 9de113644..909fd20e9 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/invar_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:invar_arrow" + "id": "basemetals:invar_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_arrow_recycling.json index 168f516ea..7f0b490ad 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_arrow" }, "result": { - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_axe.json b/src/generated/resources/data/basemetals/recipes/invar_axe.json index 9eb90a47d..f9235858b 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_axe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:invar_axe" + "id": "basemetals:invar_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_axe_recycling.json index d362e0d1d..0e2588e64 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars.json b/src/generated/resources/data/basemetals/recipes/invar_bars.json index 436b58fb8..bb0de6683 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bars.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:invar_bars" + "id": "basemetals:invar_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars_2.json b/src/generated/resources/data/basemetals/recipes/invar_bars_2.json index 9ca046a9c..264387469 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:invar_bars" + "id": "basemetals:invar_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_bars_recycling.json index 3d45bd4c3..f010ff28b 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend.json b/src/generated/resources/data/basemetals/recipes/invar_blend.json index dbd21cce3..b33a528bb 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_blend.json +++ b/src/generated/resources/data/basemetals/recipes/invar_blend.json @@ -17,7 +17,7 @@ ], "result": { "count": 3, - "item": "basemetals:invar_blend" + "id": "basemetals:invar_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json index 3997869be..a691fe189 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:invar_blend" + "id": "basemetals:invar_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/invar_blend_smelting.json index e830e9e08..048db3f2f 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/invar_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/invar" }, - "result": "basemetals:invar_ingot" + "result": { + "id": "basemetals:invar_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_block.json b/src/generated/resources/data/basemetals/recipes/invar_block.json index 8e1d52772..09843920c 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_block.json +++ b/src/generated/resources/data/basemetals/recipes/invar_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:invar_block" + "id": "basemetals:invar_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_block_crushing.json b/src/generated/resources/data/basemetals/recipes/invar_block_crushing.json index 79575e35d..0d6491647 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/invar_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:invar_powder" + "id": "basemetals:invar_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json b/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json index 88c05a9ce..6f7e1dd19 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bolt.json b/src/generated/resources/data/basemetals/recipes/invar_bolt.json index a20d95295..8a6483173 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:invar_bolt" + "id": "basemetals:invar_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_bolt_recycling.json index 666b03713..97d2d73c3 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_boots.json b/src/generated/resources/data/basemetals/recipes/invar_boots.json index ef6e2d70e..b4f7eb5ba 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_boots.json +++ b/src/generated/resources/data/basemetals/recipes/invar_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:invar_boots" + "id": "basemetals:invar_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_boots_recycling.json index 20dcf72c5..6d95bfee8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bow.json b/src/generated/resources/data/basemetals/recipes/invar_bow.json index 1ab304d56..46bdee3d2 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bow.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:invar_bow" + "id": "basemetals:invar_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_bow_recycling.json index b9c20d043..1c8dcfb73 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_bow" }, "result": { - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_button.json b/src/generated/resources/data/basemetals/recipes/invar_button.json index e62470d36..538b88e69 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_button.json +++ b/src/generated/resources/data/basemetals/recipes/invar_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:invar_button" + "id": "basemetals:invar_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_button_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_button_recycling.json index 4a2f45907..78acfbbb8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_chestplate.json b/src/generated/resources/data/basemetals/recipes/invar_chestplate.json index f90111685..2174ac1b8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/invar_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:invar_chestplate" + "id": "basemetals:invar_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_chestplate_recycling.json index de3514733..0a6d25f75 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json b/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json index 6fadbaa47..03871110f 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:invar_crackhammer" + "id": "basemetals:invar_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_crackhammer_recycling.json index 35cb72bf6..48c416fe6 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_crackhammer" }, "result": { - "item": "basemetals:invar_block" + "id": "basemetals:invar_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_crossbow.json b/src/generated/resources/data/basemetals/recipes/invar_crossbow.json index 8b3e22b38..715325bf1 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/invar_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:invar_crossbow" + "id": "basemetals:invar_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_crossbow_recycling.json index 8ca07fdc3..2fc27b659 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_door.json b/src/generated/resources/data/basemetals/recipes/invar_door.json index 230856e31..6f1746a07 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_door.json +++ b/src/generated/resources/data/basemetals/recipes/invar_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:invar_door" + "id": "basemetals:invar_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_door_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_door_recycling.json index 342101963..45d05b4d3 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json b/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json index f4e27672c..7729a8835 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:invar_fishing_rod" + "id": "basemetals:invar_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_gear.json b/src/generated/resources/data/basemetals/recipes/invar_gear.json index 116321ff9..5a23e863e 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_gear.json +++ b/src/generated/resources/data/basemetals/recipes/invar_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:invar_gear" + "id": "basemetals:invar_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_gear_recycling.json index 09f31609e..e30b5c21d 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_gear" }, "result": { - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_helmet.json b/src/generated/resources/data/basemetals/recipes/invar_helmet.json index 6b1ab8fc5..0de4d6b77 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/invar_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:invar_helmet" + "id": "basemetals:invar_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_helmet_recycling.json index c581d8a6f..1db3b3275 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_hoe.json b/src/generated/resources/data/basemetals/recipes/invar_hoe.json index 4ad1bd9a1..2a3f71a45 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:invar_hoe" + "id": "basemetals:invar_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_hoe_recycling.json index f1411417b..c575ae767 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json b/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json index ebfec1497..7685a8335 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:invar_horse_armor" + "id": "basemetals:invar_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/invar_ingot_crushing.json index f0bfab8da..d13cf86dc 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/invar_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/invar" }, "result": { - "item": "basemetals:invar_powder" + "id": "basemetals:invar_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json index 1f10ec4c9..302eafb17 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_leggings.json b/src/generated/resources/data/basemetals/recipes/invar_leggings.json index 5fb7387f6..82b13ca25 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/invar_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:invar_leggings" + "id": "basemetals:invar_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_leggings_recycling.json index 8ac8de868..e14f2fe6d 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_lever.json b/src/generated/resources/data/basemetals/recipes/invar_lever.json index 3c43a6d10..7ba6a5329 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_lever.json +++ b/src/generated/resources/data/basemetals/recipes/invar_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:invar_lever" + "id": "basemetals:invar_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_lever_recycling.json index f8f6c3ca2..632bd1e2f 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_lever" }, "result": { - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/invar_nugget_crushing.json index fc0373cf4..e775121ec 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/invar_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/invar" }, "result": { - "item": "basemetals:invar_smallpowder" + "id": "basemetals:invar_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_nuggets.json b/src/generated/resources/data/basemetals/recipes/invar_nuggets.json index ff6e7d4c7..7648e22e3 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/invar_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json b/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json index c5db5cf63..23d0e5b0f 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:invar_pickaxe" + "id": "basemetals:invar_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_pickaxe_recycling.json index d06bf1586..dfc3b5f36 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_plate.json b/src/generated/resources/data/basemetals/recipes/invar_plate.json index e9e4cd1d7..8bb198abe 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_plate.json +++ b/src/generated/resources/data/basemetals/recipes/invar_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:invar_plate" + "id": "basemetals:invar_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_plate_recycling.json index 9db380e2c..91601fd09 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_plate" }, "result": { - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json index 58d3541c5..a13be37f9 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:invar_powder" + "id": "basemetals:invar_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/invar_powder_smelting.json index 145e9bdd8..f1f1ef152 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/invar_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/invar" }, - "result": "basemetals:invar_ingot" + "result": { + "id": "basemetals:invar_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json index 452c9105a..50bc95e1a 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:invar_pressure_plate" + "id": "basemetals:invar_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_pressure_plate_recycling.json index 94ceff47b..ee39408e9 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_rod.json b/src/generated/resources/data/basemetals/recipes/invar_rod.json index 96a4fab93..128e1274b 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_rod.json +++ b/src/generated/resources/data/basemetals/recipes/invar_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:invar_rod" + "id": "basemetals:invar_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_rod_recycling.json index 5e7514e44..07b466b84 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_scythe.json b/src/generated/resources/data/basemetals/recipes/invar_scythe.json index a96d39fcb..621c94c0a 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:invar_scythe" + "id": "basemetals:invar_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_shears.json b/src/generated/resources/data/basemetals/recipes/invar_shears.json index 6bebae5fb..17c7430cc 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shears.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:invar_shears" + "id": "basemetals:invar_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_shears_recycling.json index 3ed988375..2113b4437 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_shield.json b/src/generated/resources/data/basemetals/recipes/invar_shield.json index 78cdcce90..c5efa3ccb 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shield.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:invar_shield" + "id": "basemetals:invar_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_shovel.json b/src/generated/resources/data/basemetals/recipes/invar_shovel.json index bc9725dbd..19da2dd62 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:invar_shovel" + "id": "basemetals:invar_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_shovel_recycling.json index 58ca07ef1..8cf976e5a 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_shovel" }, "result": { - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_slab.json b/src/generated/resources/data/basemetals/recipes/invar_slab.json index 987eae160..330d887f2 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_slab.json +++ b/src/generated/resources/data/basemetals/recipes/invar_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:invar_slab" + "id": "basemetals:invar_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_slab_recycling.json index 6584bf95e..755d83992 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:invar_nugget" + "id": "basemetals:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallblend.json b/src/generated/resources/data/basemetals/recipes/invar_smallblend.json index 1c3ba38ec..b9b5c1dc4 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/invar_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:invar_smallblend" + "id": "basemetals:invar_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/invar_smallblend_smelting.json index e0e084bdd..e21e347fc 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/invar_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/invar" }, - "result": "basemetals:invar_nugget" + "result": { + "id": "basemetals:invar_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json b/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json index 707246137..3da4fc749 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:invar_smallpowder" + "id": "basemetals:invar_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/invar_smallpowder_smelting.json index d273ad7a2..016212a97 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/invar_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/invar" }, - "result": "basemetals:invar_nugget" + "result": { + "id": "basemetals:invar_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_stairs.json b/src/generated/resources/data/basemetals/recipes/invar_stairs.json index 39c12eab3..0949ad9f7 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/invar_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:invar_stairs" + "id": "basemetals:invar_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_sword.json b/src/generated/resources/data/basemetals/recipes/invar_sword.json index 3d33a3399..aae647dcf 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_sword.json +++ b/src/generated/resources/data/basemetals/recipes/invar_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:invar_sword" + "id": "basemetals:invar_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_sword_recycling.json index 50f45e021..29efa9f61 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json b/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json index 6a637a895..2a96fcfbe 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:invar_trapdoor" + "id": "basemetals:invar_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_trapdoor_recycling.json index fff3728ed..3d1d49f79 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:invar_ingot" + "id": "basemetals:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_wall.json b/src/generated/resources/data/basemetals/recipes/invar_wall.json index 7e6571c6f..082da1f58 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_wall.json +++ b/src/generated/resources/data/basemetals/recipes/invar_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:invar_wall" + "id": "basemetals:invar_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/invar_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/invar_wall_recycling.json index 1bf2662dc..a28a3bce4 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/invar_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:invar_wall" }, "result": { - "item": "basemetals:invar_block" + "id": "basemetals:invar_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_arrow.json b/src/generated/resources/data/basemetals/recipes/iron_arrow.json index ab4614b64..43d692dd9 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/iron_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:iron_arrow" + "id": "basemetals:iron_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_arrow_recycling.json index 7c5c35cb7..09ff70eff 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_arrow" }, "result": { - "item": "minecraft:iron_nugget" + "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_bars_2.json b/src/generated/resources/data/basemetals/recipes/iron_bars_2.json index 70f647f6d..c25739c5e 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "minecraft:iron_bars" + "id": "minecraft:iron_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_block_crushing.json b/src/generated/resources/data/basemetals/recipes/iron_block_crushing.json index fb2e443f9..39faabddc 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/iron_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:iron_powder" + "id": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_bolt.json b/src/generated/resources/data/basemetals/recipes/iron_bolt.json index e5d7557de..1c4d5f1ec 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:iron_bolt" + "id": "basemetals:iron_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_bolt_recycling.json index 22ee9292b..45be8f593 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:iron_nugget" + "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_bow.json b/src/generated/resources/data/basemetals/recipes/iron_bow.json index 9ca7a77e7..8a0984e9a 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bow.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:iron_bow" + "id": "basemetals:iron_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_bow_recycling.json index 74adba409..1b7e0fafb 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_bow" }, "result": { - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_button.json b/src/generated/resources/data/basemetals/recipes/iron_button.json index c5624158b..0c9390e50 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_button.json +++ b/src/generated/resources/data/basemetals/recipes/iron_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:iron_button" + "id": "basemetals:iron_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_button_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_button_recycling.json index fa85e5e6d..893513aaa 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:iron_nugget" + "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json b/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json index 8ca8b4ed3..8e3a7cf95 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:iron_crackhammer" + "id": "basemetals:iron_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_crackhammer_recycling.json index d4f608acc..f80dfc394 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_crackhammer" }, "result": { - "item": "minecraft:iron_block" + "id": "minecraft:iron_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_crossbow.json b/src/generated/resources/data/basemetals/recipes/iron_crossbow.json index d00d11772..486cab380 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/iron_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:iron_crossbow" + "id": "basemetals:iron_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_crossbow_recycling.json index 0202935c4..c6943f0b6 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json b/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json index 59600af42..616934652 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:iron_fishing_rod" + "id": "basemetals:iron_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_gear.json b/src/generated/resources/data/basemetals/recipes/iron_gear.json index d433aa809..e48d2b128 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_gear.json +++ b/src/generated/resources/data/basemetals/recipes/iron_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:iron_gear" + "id": "basemetals:iron_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_gear_recycling.json index 7fbcadb9a..bf718d3c8 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_gear" }, "result": { - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/iron_ingot_crushing.json index 15bf517f3..8c31f6840 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/iron_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/iron" }, "result": { - "item": "basemetals:iron_powder" + "id": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_lever.json b/src/generated/resources/data/basemetals/recipes/iron_lever.json index e0daaa093..491d8253b 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_lever.json +++ b/src/generated/resources/data/basemetals/recipes/iron_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:iron_lever" + "id": "basemetals:iron_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_lever_recycling.json index b009c7f99..b534643e3 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_lever" }, "result": { - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/iron_nugget_crushing.json index b2c5a0ad0..b2d47e686 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/iron_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/iron" }, "result": { - "item": "basemetals:iron_smallpowder" + "id": "basemetals:iron_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/iron_ore_crushing.json index 10ed6211d..97ac8726c 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/iron_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:iron_powder" + "id": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_plate.json b/src/generated/resources/data/basemetals/recipes/iron_plate.json index 6f8ca9720..49590579a 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_plate.json +++ b/src/generated/resources/data/basemetals/recipes/iron_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:iron_plate" + "id": "basemetals:iron_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_plate_recycling.json index 5e41975ec..85db887ae 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_plate" }, "result": { - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json index 90a0c977a..6f20da29f 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:iron_powder" + "id": "basemetals:iron_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/iron_powder_smelting.json index d246580d4..a997d2d2c 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/iron_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/iron" }, - "result": "minecraft:iron_ingot" + "result": { + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/iron_raw_crushing.json index f8ccfe04e..f59b3c1a7 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/iron_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/iron" }, "result": { - "item": "basemetals:iron_powder" + "id": "basemetals:iron_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_rod.json b/src/generated/resources/data/basemetals/recipes/iron_rod.json index 6ca7240cb..4ca13409e 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_rod.json +++ b/src/generated/resources/data/basemetals/recipes/iron_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:iron_rod" + "id": "basemetals:iron_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_rod_recycling.json index 1bb7fa883..e2a929cc0 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:iron_nugget" + "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_scythe.json b/src/generated/resources/data/basemetals/recipes/iron_scythe.json index ad4a32b77..8e6576dff 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/iron_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:iron_scythe" + "id": "basemetals:iron_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_shield.json b/src/generated/resources/data/basemetals/recipes/iron_shield.json index 7f93561d4..c11d7242d 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_shield.json +++ b/src/generated/resources/data/basemetals/recipes/iron_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:iron_shield" + "id": "basemetals:iron_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_slab.json b/src/generated/resources/data/basemetals/recipes/iron_slab.json index 95c86ebf3..87ca67672 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_slab.json +++ b/src/generated/resources/data/basemetals/recipes/iron_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:iron_slab" + "id": "basemetals:iron_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_slab_recycling.json index c66b0e79a..150d09506 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:iron_nugget" + "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/iron_smallblend_smelting.json index f4cc0a360..6cb1f6e72 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/iron_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/iron" }, - "result": "minecraft:iron_nugget" + "result": { + "id": "minecraft:iron_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json b/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json index 1987ecde4..60ac4cbb6 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:iron_smallpowder" + "id": "basemetals:iron_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/iron_smallpowder_smelting.json index 9319356ed..a89a5d671 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/iron_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/iron" }, - "result": "minecraft:iron_nugget" + "result": { + "id": "minecraft:iron_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_stairs.json b/src/generated/resources/data/basemetals/recipes/iron_stairs.json index f6e6d7f77..e91292477 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/iron_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:iron_stairs" + "id": "basemetals:iron_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_wall.json b/src/generated/resources/data/basemetals/recipes/iron_wall.json index 903bc9136..c1ef12f06 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_wall.json +++ b/src/generated/resources/data/basemetals/recipes/iron_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:iron_wall" + "id": "basemetals:iron_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/iron_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/iron_wall_recycling.json index 29414a511..fc218290d 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/iron_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:iron_wall" }, "result": { - "item": "minecraft:iron_block" + "id": "minecraft:iron_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lapis_block_crushing.json b/src/generated/resources/data/basemetals/recipes/lapis_block_crushing.json index 05ffeeb24..c61ec366f 100644 --- a/src/generated/resources/data/basemetals/recipes/lapis_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lapis_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "minecraft:lapis_lazuli" + "id": "minecraft:lapis_lazuli" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lapis_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/lapis_ore_crushing.json index 683025316..408627225 100644 --- a/src/generated/resources/data/basemetals/recipes/lapis_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lapis_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 8, - "item": "minecraft:lapis_lazuli" + "id": "minecraft:lapis_lazuli" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_arrow.json b/src/generated/resources/data/basemetals/recipes/lead_arrow.json index b093d3c99..93c2e2284 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/lead_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:lead_arrow" + "id": "basemetals:lead_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_arrow_recycling.json index 0e1909595..0e25701e7 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_arrow" }, "result": { - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_axe.json b/src/generated/resources/data/basemetals/recipes/lead_axe.json index 718703f7c..6e611f1b7 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_axe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:lead_axe" + "id": "basemetals:lead_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_axe_recycling.json index 9aad22b46..cadae44ed 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars.json b/src/generated/resources/data/basemetals/recipes/lead_bars.json index 323b39b3c..3b6fa7fda 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bars.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:lead_bars" + "id": "basemetals:lead_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars_2.json b/src/generated/resources/data/basemetals/recipes/lead_bars_2.json index 2daedf51c..041170258 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:lead_bars" + "id": "basemetals:lead_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_bars_recycling.json index 667f24494..1999a6658 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_block.json b/src/generated/resources/data/basemetals/recipes/lead_block.json index 50f466f77..55ac9e7d9 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_block.json +++ b/src/generated/resources/data/basemetals/recipes/lead_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:lead_block" + "id": "basemetals:lead_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_block_crushing.json b/src/generated/resources/data/basemetals/recipes/lead_block_crushing.json index 6b7311e11..138f94575 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lead_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:lead_powder" + "id": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json b/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json index b64ec2db3..13470691f 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bolt.json b/src/generated/resources/data/basemetals/recipes/lead_bolt.json index 29a970c97..1c1abdf81 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:lead_bolt" + "id": "basemetals:lead_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_bolt_recycling.json index afbb8d32d..b2bc47f04 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_boots.json b/src/generated/resources/data/basemetals/recipes/lead_boots.json index e879dbbe6..a92dd674c 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_boots.json +++ b/src/generated/resources/data/basemetals/recipes/lead_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:lead_boots" + "id": "basemetals:lead_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_boots_recycling.json index 06042472b..30c17a904 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bow.json b/src/generated/resources/data/basemetals/recipes/lead_bow.json index 538771261..a29e96592 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bow.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:lead_bow" + "id": "basemetals:lead_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_bow_recycling.json index eaee64be6..ccf3aa8fe 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_bow" }, "result": { - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_button.json b/src/generated/resources/data/basemetals/recipes/lead_button.json index 478251271..4bd3c5a66 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_button.json +++ b/src/generated/resources/data/basemetals/recipes/lead_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:lead_button" + "id": "basemetals:lead_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_button_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_button_recycling.json index 27a9ccb53..648e0eb84 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_chestplate.json b/src/generated/resources/data/basemetals/recipes/lead_chestplate.json index fe551b38d..732c5eca3 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/lead_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:lead_chestplate" + "id": "basemetals:lead_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_chestplate_recycling.json index d1f19a726..f2f55d979 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json b/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json index 896bd0bac..ec3ddcfd6 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:lead_crackhammer" + "id": "basemetals:lead_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_crackhammer_recycling.json index 1fdbeda95..acfbb8800 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_crackhammer" }, "result": { - "item": "basemetals:lead_block" + "id": "basemetals:lead_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_crossbow.json b/src/generated/resources/data/basemetals/recipes/lead_crossbow.json index c3d50c1c0..5b97f8426 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/lead_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:lead_crossbow" + "id": "basemetals:lead_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_crossbow_recycling.json index b339bb798..1d487c9fa 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_door.json b/src/generated/resources/data/basemetals/recipes/lead_door.json index a51634e7d..957c39884 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_door.json +++ b/src/generated/resources/data/basemetals/recipes/lead_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:lead_door" + "id": "basemetals:lead_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_door_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_door_recycling.json index 344921407..457edb31f 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json b/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json index 701fc96b8..dacf8655d 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:lead_fishing_rod" + "id": "basemetals:lead_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_gear.json b/src/generated/resources/data/basemetals/recipes/lead_gear.json index 6c51ccfbe..8a77c5c95 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_gear.json +++ b/src/generated/resources/data/basemetals/recipes/lead_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:lead_gear" + "id": "basemetals:lead_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_gear_recycling.json index 1051dd288..e30aa14e3 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_gear" }, "result": { - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_helmet.json b/src/generated/resources/data/basemetals/recipes/lead_helmet.json index 6e87b2469..e76b1dcab 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/lead_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:lead_helmet" + "id": "basemetals:lead_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_helmet_recycling.json index d195545a9..7303dc529 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_hoe.json b/src/generated/resources/data/basemetals/recipes/lead_hoe.json index 403e716c1..b0eaff30b 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:lead_hoe" + "id": "basemetals:lead_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_hoe_recycling.json index 95d143efc..7992a2628 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json b/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json index 1f7639b87..482d4eadb 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:lead_horse_armor" + "id": "basemetals:lead_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/lead_ingot_crushing.json index 09a6c7086..430d0b7a5 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lead_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/lead" }, "result": { - "item": "basemetals:lead_powder" + "id": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json index f069a391c..13c03f907 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_leggings.json b/src/generated/resources/data/basemetals/recipes/lead_leggings.json index 30df657da..07e02cf58 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/lead_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:lead_leggings" + "id": "basemetals:lead_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_leggings_recycling.json index e88b2bb5d..ca28aa786 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_lever.json b/src/generated/resources/data/basemetals/recipes/lead_lever.json index 7eb54454d..2b976b5e7 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_lever.json +++ b/src/generated/resources/data/basemetals/recipes/lead_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:lead_lever" + "id": "basemetals:lead_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_lever_recycling.json index 6363eb725..38cac4111 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_lever" }, "result": { - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/lead_nugget_crushing.json index 6e82bf7ef..cf6201824 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lead_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/lead" }, "result": { - "item": "basemetals:lead_smallpowder" + "id": "basemetals:lead_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_nuggets.json b/src/generated/resources/data/basemetals/recipes/lead_nuggets.json index 3adffc5af..65856a9f6 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/lead_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/lead_ore_blasting.json index f3bf1a451..7fcced3be 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/lead_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/lead" }, - "result": "basemetals:lead_ingot" + "result": { + "id": "basemetals:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/lead_ore_crushing.json index 901fdeb07..206ac5b60 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lead_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_powder" + "id": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/lead_ore_smelting.json index ca9c961c7..7388232e2 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/lead_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/lead" }, - "result": "basemetals:lead_ingot" + "result": { + "id": "basemetals:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json b/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json index 9e6735fa0..711fa686f 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:lead_pickaxe" + "id": "basemetals:lead_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_pickaxe_recycling.json index dde09e8fc..b5eb2fb17 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_plate.json b/src/generated/resources/data/basemetals/recipes/lead_plate.json index 3e21a4760..3bb2ee8d7 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_plate.json +++ b/src/generated/resources/data/basemetals/recipes/lead_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:lead_plate" + "id": "basemetals:lead_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_plate_recycling.json index f953fd5fb..0f3d2915b 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_plate" }, "result": { - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json index 083872ece..17f0afd31 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:lead_powder" + "id": "basemetals:lead_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/lead_powder_smelting.json index 6c57dd53f..88a96944e 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/lead_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/lead" }, - "result": "basemetals:lead_ingot" + "result": { + "id": "basemetals:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json index 52b66a4d1..51b4c8827 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:lead_pressure_plate" + "id": "basemetals:lead_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_pressure_plate_recycling.json index f7d1ca6a6..c5c1a93c3 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/lead_raw_blasting.json index b021f9dbb..2f49a967c 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/lead_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/lead" }, - "result": "basemetals:lead_ingot" + "result": { + "id": "basemetals:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/lead_raw_crushing.json index a4c939e52..ee341ad8d 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/lead_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/lead" }, "result": { - "item": "basemetals:lead_powder" + "id": "basemetals:lead_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/lead_raw_smelting.json index b5fcbfba4..d1c72a0e9 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/lead_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/lead" }, - "result": "basemetals:lead_ingot" + "result": { + "id": "basemetals:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_rod.json b/src/generated/resources/data/basemetals/recipes/lead_rod.json index bef39d106..e75ec0504 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_rod.json +++ b/src/generated/resources/data/basemetals/recipes/lead_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:lead_rod" + "id": "basemetals:lead_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_rod_recycling.json index fbcb4fe06..1799ce908 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_scythe.json b/src/generated/resources/data/basemetals/recipes/lead_scythe.json index fe6bfaecc..9cddf716a 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:lead_scythe" + "id": "basemetals:lead_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_shears.json b/src/generated/resources/data/basemetals/recipes/lead_shears.json index 16a62f253..b51c9ffd0 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shears.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:lead_shears" + "id": "basemetals:lead_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_shears_recycling.json index 82d6f1678..142970793 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_shield.json b/src/generated/resources/data/basemetals/recipes/lead_shield.json index f4178200b..5bd65543f 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shield.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:lead_shield" + "id": "basemetals:lead_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_shovel.json b/src/generated/resources/data/basemetals/recipes/lead_shovel.json index f6c0609aa..1a7547259 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:lead_shovel" + "id": "basemetals:lead_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_shovel_recycling.json index 7f242f2b9..0a419f4a8 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_shovel" }, "result": { - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_slab.json b/src/generated/resources/data/basemetals/recipes/lead_slab.json index 0fad9c2d8..26d8b3299 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_slab.json +++ b/src/generated/resources/data/basemetals/recipes/lead_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:lead_slab" + "id": "basemetals:lead_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_slab_recycling.json index 02a5dfd8b..4940ac681 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:lead_nugget" + "id": "basemetals:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json b/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json index a8eed9301..1d6900a04 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:lead_smallpowder" + "id": "basemetals:lead_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/lead_smallpowder_smelting.json index 3b2fcce6f..bd56b3348 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/lead_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/lead" }, - "result": "basemetals:lead_nugget" + "result": { + "id": "basemetals:lead_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_stairs.json b/src/generated/resources/data/basemetals/recipes/lead_stairs.json index a359b47c5..c45d531bf 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/lead_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:lead_stairs" + "id": "basemetals:lead_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_sword.json b/src/generated/resources/data/basemetals/recipes/lead_sword.json index 60a985a9f..c2877cd50 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_sword.json +++ b/src/generated/resources/data/basemetals/recipes/lead_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:lead_sword" + "id": "basemetals:lead_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_sword_recycling.json index 8f67564bc..f9252457d 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json b/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json index 963cd53bf..2b5169245 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:lead_trapdoor" + "id": "basemetals:lead_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_trapdoor_recycling.json index 32c2e6957..282703d28 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:lead_ingot" + "id": "basemetals:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_wall.json b/src/generated/resources/data/basemetals/recipes/lead_wall.json index 7c1cb7f4a..7800df34e 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_wall.json +++ b/src/generated/resources/data/basemetals/recipes/lead_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:lead_wall" + "id": "basemetals:lead_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/lead_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/lead_wall_recycling.json index 7e129baaf..553156f03 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/lead_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:lead_wall" }, "result": { - "item": "basemetals:lead_block" + "id": "basemetals:lead_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/mercury_ingot_crushing.json index afda224f0..ab24ec424 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/mercury" }, "result": { - "item": "basemetals:mercury_powder" + "id": "basemetals:mercury_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json index d27c044e8..fb5512b19 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mercury_ingot" + "id": "basemetals:mercury_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/mercury_nugget_crushing.json index 4706c089a..f989ae89c 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/mercury" }, "result": { - "item": "basemetals:mercury_smallpowder" + "id": "basemetals:mercury_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json b/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json index 65e9a9fc4..3a2875498 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:mercury_nugget" + "id": "basemetals:mercury_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/mercury_ore_blasting.json index 223fd14e3..8daf96f62 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/mercury" }, - "result": "basemetals:mercury_ingot" + "result": { + "id": "basemetals:mercury_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/mercury_ore_crushing.json index 34779fd0d..caf7200c3 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:mercury_powder" + "id": "basemetals:mercury_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/mercury_ore_smelting.json index c788e17f1..be40f895f 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/mercury" }, - "result": "basemetals:mercury_ingot" + "result": { + "id": "basemetals:mercury_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json index 6a806c271..5f3ac821d 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mercury_powder" + "id": "basemetals:mercury_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/mercury_powder_smelting.json index 2d9bd81f5..031ded017 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/mercury" }, - "result": "basemetals:mercury_ingot" + "result": { + "id": "basemetals:mercury_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/mercury_raw_blasting.json index 8d24d06d5..aba7af40d 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/mercury" }, - "result": "basemetals:mercury_ingot" + "result": { + "id": "basemetals:mercury_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/mercury_raw_crushing.json index 70a6637c4..c7ee65c2d 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/mercury" }, "result": { - "item": "basemetals:mercury_powder" + "id": "basemetals:mercury_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/mercury_raw_smelting.json index eaff834be..fbc5095f2 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/mercury" }, - "result": "basemetals:mercury_ingot" + "result": { + "id": "basemetals:mercury_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json index e041b36ba..03d311461 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:mercury_smallpowder" + "id": "basemetals:mercury_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json index e0e95b1b3..7a73e9cc7 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json @@ -6,6 +6,6 @@ "tag": "forge:tiny_dusts/mercury" }, "result": { - "item": "basemetals:mercury_nugget" + "id": "basemetals:mercury_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/minecart.json b/src/generated/resources/data/basemetals/recipes/minecart.json index 51fa2ef0c..485a15547 100644 --- a/src/generated/resources/data/basemetals/recipes/minecart.json +++ b/src/generated/resources/data/basemetals/recipes/minecart.json @@ -14,7 +14,7 @@ "XXX" ], "result": { - "item": "minecraft:minecart" + "id": "minecraft:minecart" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_arrow.json b/src/generated/resources/data/basemetals/recipes/mithril_arrow.json index 85e0afd79..6dfc01390 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:mithril_arrow" + "id": "basemetals:mithril_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_arrow_recycling.json index 0b0b9ebaa..a169c06a4 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_arrow" }, "result": { - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_axe.json b/src/generated/resources/data/basemetals/recipes/mithril_axe.json index d96243f20..2c94fb301 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_axe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:mithril_axe" + "id": "basemetals:mithril_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_axe_recycling.json index cf29bbb90..633827a6b 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars.json b/src/generated/resources/data/basemetals/recipes/mithril_bars.json index fb710daa9..1e3824760 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bars.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:mithril_bars" + "id": "basemetals:mithril_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json b/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json index 95ecaad5f..ec9fd39e9 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:mithril_bars" + "id": "basemetals:mithril_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_bars_recycling.json index a084eeeca..00c377dd8 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend.json b/src/generated/resources/data/basemetals/recipes/mithril_blend.json index 668863c5e..fc8c06f71 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_blend.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_blend.json @@ -20,7 +20,7 @@ ], "result": { "count": 3, - "item": "basemetals:mithril_blend" + "id": "basemetals:mithril_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json index eee36be08..f6f950336 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mithril_blend" + "id": "basemetals:mithril_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/mithril_blend_smelting.json index 24fc8cbec..8478f6708 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/mithril" }, - "result": "basemetals:mithril_ingot" + "result": { + "id": "basemetals:mithril_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block.json b/src/generated/resources/data/basemetals/recipes/mithril_block.json index d0ae9873c..caaa3e196 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_block.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mithril_block" + "id": "basemetals:mithril_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block_crushing.json b/src/generated/resources/data/basemetals/recipes/mithril_block_crushing.json index 8255f5a6f..cd1af4a9e 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:mithril_powder" + "id": "basemetals:mithril_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json b/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json index 0de2e24c5..c5a7c89dd 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bolt.json b/src/generated/resources/data/basemetals/recipes/mithril_bolt.json index f1ea781fa..20d5da221 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:mithril_bolt" + "id": "basemetals:mithril_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_bolt_recycling.json index 3343db9d5..09556c46a 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_boots.json b/src/generated/resources/data/basemetals/recipes/mithril_boots.json index f3da041b2..5003a54d3 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_boots.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:mithril_boots" + "id": "basemetals:mithril_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_boots_recycling.json index 183d538ca..21f654eeb 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bow.json b/src/generated/resources/data/basemetals/recipes/mithril_bow.json index 769cc547d..d6c01e41f 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bow.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:mithril_bow" + "id": "basemetals:mithril_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_bow_recycling.json index a42042288..23df4ec27 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_bow" }, "result": { - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_button.json b/src/generated/resources/data/basemetals/recipes/mithril_button.json index 309087fe7..8f80a5e87 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_button.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:mithril_button" + "id": "basemetals:mithril_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_button_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_button_recycling.json index e80993d31..91f3fbba9 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json b/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json index ee4a05223..d7fb601f4 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mithril_chestplate" + "id": "basemetals:mithril_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_chestplate_recycling.json index dc52016a9..7ca1e9782 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json b/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json index b9e20e28e..fa78ff44c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:mithril_crackhammer" + "id": "basemetals:mithril_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_crackhammer_recycling.json index 2cbad6690..1e242aa8d 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_crackhammer" }, "result": { - "item": "basemetals:mithril_block" + "id": "basemetals:mithril_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json b/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json index 582e2d3fe..b179b225f 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:mithril_crossbow" + "id": "basemetals:mithril_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_crossbow_recycling.json index 777d55fed..1cd29f453 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_door.json b/src/generated/resources/data/basemetals/recipes/mithril_door.json index 1324baf81..5446bc80a 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_door.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:mithril_door" + "id": "basemetals:mithril_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_door_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_door_recycling.json index 65d215c75..46b9bf029 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json b/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json index 4dd5e3352..06e6d8bed 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:mithril_fishing_rod" + "id": "basemetals:mithril_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_gear.json b/src/generated/resources/data/basemetals/recipes/mithril_gear.json index 1e615fcb7..533c86596 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_gear.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:mithril_gear" + "id": "basemetals:mithril_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_gear_recycling.json index 36f2f131b..259115ed8 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_gear" }, "result": { - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_helmet.json b/src/generated/resources/data/basemetals/recipes/mithril_helmet.json index b4e6711cd..6ed6edc7b 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:mithril_helmet" + "id": "basemetals:mithril_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_helmet_recycling.json index 4c5357a9e..fa5cceb86 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_hoe.json b/src/generated/resources/data/basemetals/recipes/mithril_hoe.json index b83db9c83..c0a3ffccc 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:mithril_hoe" + "id": "basemetals:mithril_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_hoe_recycling.json index 9e5632175..33d623e3c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json b/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json index 8629ef36f..806a3a3a0 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:mithril_horse_armor" + "id": "basemetals:mithril_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/mithril_ingot_crushing.json index 39c9870e0..1b88b0c91 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/mithril" }, "result": { - "item": "basemetals:mithril_powder" + "id": "basemetals:mithril_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json index 38fecf3bd..89dfe80b9 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_leggings.json b/src/generated/resources/data/basemetals/recipes/mithril_leggings.json index fd36eb67d..29c57d27c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:mithril_leggings" + "id": "basemetals:mithril_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_leggings_recycling.json index f1e149d09..9cd3ac717 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_lever.json b/src/generated/resources/data/basemetals/recipes/mithril_lever.json index fe2465e80..76f8a3175 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_lever.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:mithril_lever" + "id": "basemetals:mithril_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_lever_recycling.json index 41a7520dc..c15e7c12e 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_lever" }, "result": { - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/mithril_nugget_crushing.json index a86a2c9ec..ab3cde062 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/mithril" }, "result": { - "item": "basemetals:mithril_smallpowder" + "id": "basemetals:mithril_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json b/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json index 73d29f9cd..233e6eb0a 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json b/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json index a08ce8576..b9d8b3a03 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:mithril_pickaxe" + "id": "basemetals:mithril_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_pickaxe_recycling.json index cd0fe6b78..1beb12945 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_plate.json b/src/generated/resources/data/basemetals/recipes/mithril_plate.json index d20d86917..4bbacd8f4 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_plate.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:mithril_plate" + "id": "basemetals:mithril_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_plate_recycling.json index 071f1ba22..1ac9ae9dc 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_plate" }, "result": { - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json index d99c9966c..82c3be821 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:mithril_powder" + "id": "basemetals:mithril_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/mithril_powder_smelting.json index db56f1979..2bb674f97 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/mithril" }, - "result": "basemetals:mithril_ingot" + "result": { + "id": "basemetals:mithril_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json index b49eb4f11..cb811ff0c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:mithril_pressure_plate" + "id": "basemetals:mithril_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate_recycling.json index c55d8b80e..8ccc417f6 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_rod.json b/src/generated/resources/data/basemetals/recipes/mithril_rod.json index 6b4586140..714d2aef8 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_rod.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:mithril_rod" + "id": "basemetals:mithril_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_rod_recycling.json index 5fb899b7b..1ad4cd24a 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_scythe.json b/src/generated/resources/data/basemetals/recipes/mithril_scythe.json index b0ca6d884..094f4aa4d 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:mithril_scythe" + "id": "basemetals:mithril_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shears.json b/src/generated/resources/data/basemetals/recipes/mithril_shears.json index 6191c863e..a10f61a38 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shears.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:mithril_shears" + "id": "basemetals:mithril_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_shears_recycling.json index e78a20331..e9b9ddd87 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shield.json b/src/generated/resources/data/basemetals/recipes/mithril_shield.json index 4cb831024..83c0a0d58 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shield.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:mithril_shield" + "id": "basemetals:mithril_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shovel.json b/src/generated/resources/data/basemetals/recipes/mithril_shovel.json index 67f08bc2b..d1ceef9e8 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:mithril_shovel" + "id": "basemetals:mithril_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_shovel_recycling.json index 51c7a56a7..ac5f2cce5 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_shovel" }, "result": { - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_slab.json b/src/generated/resources/data/basemetals/recipes/mithril_slab.json index c30e91fd4..e94e0dfde 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_slab.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:mithril_slab" + "id": "basemetals:mithril_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_slab_recycling.json index 3f96a5541..011439f91 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:mithril_nugget" + "id": "basemetals:mithril_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json b/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json index 92e1b5c67..d1113f2df 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:mithril_smallblend" + "id": "basemetals:mithril_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/mithril_smallblend_smelting.json index fe39d647e..4a20ab8db 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/mithril" }, - "result": "basemetals:mithril_nugget" + "result": { + "id": "basemetals:mithril_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json b/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json index d9e8d2b90..258a08247 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:mithril_smallpowder" + "id": "basemetals:mithril_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/mithril_smallpowder_smelting.json index 623271dad..a0bb415cb 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/mithril" }, - "result": "basemetals:mithril_nugget" + "result": { + "id": "basemetals:mithril_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_stairs.json b/src/generated/resources/data/basemetals/recipes/mithril_stairs.json index ce8bb09be..0a03d8971 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:mithril_stairs" + "id": "basemetals:mithril_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_sword.json b/src/generated/resources/data/basemetals/recipes/mithril_sword.json index b9ef4407d..cdd541c35 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_sword.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:mithril_sword" + "id": "basemetals:mithril_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_sword_recycling.json index 4cc1c7694..ead40fd81 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json b/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json index a82a30f5f..83803b040 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:mithril_trapdoor" + "id": "basemetals:mithril_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_trapdoor_recycling.json index 147f45121..ce6f4677e 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:mithril_ingot" + "id": "basemetals:mithril_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_wall.json b/src/generated/resources/data/basemetals/recipes/mithril_wall.json index 30ba7c7ec..c1b40905f 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_wall.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:mithril_wall" + "id": "basemetals:mithril_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mithril_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/mithril_wall_recycling.json index 89286a780..32c9ce5f1 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:mithril_wall" }, "result": { - "item": "basemetals:mithril_block" + "id": "basemetals:mithril_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_crushing.json b/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_crushing.json index 70f076a0c..3898179ed 100644 --- a/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:mossy_cobblestone" }, "result": { - "item": "minecraft:gravel" + "id": "minecraft:gravel" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_wall_crushing.json b/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_wall_crushing.json index 761d9d96a..768e33dd7 100644 --- a/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_wall_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/mossy_cobblestone_wall_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:mossy_cobblestone_wall" }, "result": { - "item": "minecraft:gravel" + "id": "minecraft:gravel" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_arrow.json b/src/generated/resources/data/basemetals/recipes/nickel_arrow.json index 9d87e3b21..b658b728d 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:nickel_arrow" + "id": "basemetals:nickel_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_arrow_recycling.json index c69208521..a8c062d96 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_arrow" }, "result": { - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_axe.json b/src/generated/resources/data/basemetals/recipes/nickel_axe.json index 997fee93b..2b579866a 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:nickel_axe" + "id": "basemetals:nickel_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_axe_recycling.json index de30ba201..c99e5a5b5 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars.json b/src/generated/resources/data/basemetals/recipes/nickel_bars.json index 7d90b46c7..7d925109b 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:nickel_bars" + "id": "basemetals:nickel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json b/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json index b604a8389..f21f01ea3 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:nickel_bars" + "id": "basemetals:nickel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_bars_recycling.json index a68e19577..9290ffc36 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block.json b/src/generated/resources/data/basemetals/recipes/nickel_block.json index 7bc0b9ac5..e47e0678d 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_block.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:nickel_block" + "id": "basemetals:nickel_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block_crushing.json b/src/generated/resources/data/basemetals/recipes/nickel_block_crushing.json index 046a8067a..7539a3f29 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:nickel_powder" + "id": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json index 4c2b7f1e1..cd384d94e 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bolt.json b/src/generated/resources/data/basemetals/recipes/nickel_bolt.json index fa7eee455..b9b0c9a87 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:nickel_bolt" + "id": "basemetals:nickel_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_bolt_recycling.json index 5a1293325..350de8813 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_boots.json b/src/generated/resources/data/basemetals/recipes/nickel_boots.json index abd6c9b08..d1dd53939 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:nickel_boots" + "id": "basemetals:nickel_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_boots_recycling.json index d00f0d027..87e2741f5 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bow.json b/src/generated/resources/data/basemetals/recipes/nickel_bow.json index 15c7635c8..2aea110e2 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:nickel_bow" + "id": "basemetals:nickel_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_bow_recycling.json index 691c5523a..99aa1ccda 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_bow" }, "result": { - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_button.json b/src/generated/resources/data/basemetals/recipes/nickel_button.json index 64375fbcf..403b16f1d 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_button.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:nickel_button" + "id": "basemetals:nickel_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_button_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_button_recycling.json index 028540686..175d835c6 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json b/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json index f8a232dc6..8c2e4ceec 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:nickel_chestplate" + "id": "basemetals:nickel_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_chestplate_recycling.json index e0584fffe..dac85b7ec 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json index 9d5f1dd4a..5d11ca7c3 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:nickel_crackhammer" + "id": "basemetals:nickel_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_crackhammer_recycling.json index 8e654e934..f6a75597c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_crackhammer" }, "result": { - "item": "basemetals:nickel_block" + "id": "basemetals:nickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json b/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json index 8ff65f954..b1d38051a 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:nickel_crossbow" + "id": "basemetals:nickel_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_crossbow_recycling.json index c2121588a..60aa07af9 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_door.json b/src/generated/resources/data/basemetals/recipes/nickel_door.json index d0d0d6411..d9dabc044 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_door.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:nickel_door" + "id": "basemetals:nickel_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_door_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_door_recycling.json index 211fd74f6..a2248b5c9 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json index 55954d54b..6e7c45fe4 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:nickel_fishing_rod" + "id": "basemetals:nickel_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_gear.json b/src/generated/resources/data/basemetals/recipes/nickel_gear.json index 4be9d3537..f4ad1a0a7 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:nickel_gear" + "id": "basemetals:nickel_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_gear_recycling.json index 316ec6f48..858229377 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_gear" }, "result": { - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_helmet.json b/src/generated/resources/data/basemetals/recipes/nickel_helmet.json index efbd1ab40..b706a60e3 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:nickel_helmet" + "id": "basemetals:nickel_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_helmet_recycling.json index 02b19e11e..3798c5a4c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_hoe.json b/src/generated/resources/data/basemetals/recipes/nickel_hoe.json index 1556a26b9..c7fa8bd79 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:nickel_hoe" + "id": "basemetals:nickel_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_hoe_recycling.json index 28c60c109..429717067 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json index 5e927ba00..24a0c2041 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:nickel_horse_armor" + "id": "basemetals:nickel_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/nickel_ingot_crushing.json index 88fd481c2..51fe08a15 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/nickel" }, "result": { - "item": "basemetals:nickel_powder" + "id": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json index e6376a88f..979b7777c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_leggings.json b/src/generated/resources/data/basemetals/recipes/nickel_leggings.json index c4365974a..abbc2d93b 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:nickel_leggings" + "id": "basemetals:nickel_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_leggings_recycling.json index 7e970efb2..9dc2c5ada 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_lever.json b/src/generated/resources/data/basemetals/recipes/nickel_lever.json index ebd00c02c..dd75d1f78 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:nickel_lever" + "id": "basemetals:nickel_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_lever_recycling.json index c9fca876c..173f9b4f0 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_lever" }, "result": { - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/nickel_nugget_crushing.json index e66009fea..96412b080 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/nickel" }, "result": { - "item": "basemetals:nickel_smallpowder" + "id": "basemetals:nickel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json b/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json index 42effff49..300de44d7 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/nickel_ore_blasting.json index f16a6040e..7ab2f79d2 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/nickel" }, - "result": "basemetals:nickel_ingot" + "result": { + "id": "basemetals:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/nickel_ore_crushing.json index 31c6f21e0..d95fec3de 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_powder" + "id": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/nickel_ore_smelting.json index 66645743a..7f3d93fc1 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/nickel" }, - "result": "basemetals:nickel_ingot" + "result": { + "id": "basemetals:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json index 6eef45e96..181823739 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:nickel_pickaxe" + "id": "basemetals:nickel_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_pickaxe_recycling.json index f6a2f6f76..f68cdef44 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_plate.json b/src/generated/resources/data/basemetals/recipes/nickel_plate.json index 65a6f6e38..12e1e3378 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:nickel_plate" + "id": "basemetals:nickel_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_plate_recycling.json index dfa473789..2f403f985 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_plate" }, "result": { - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json index 57fc97065..5e268c4fc 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:nickel_powder" + "id": "basemetals:nickel_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/nickel_powder_smelting.json index 6fff19bd3..fa823f404 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/nickel" }, - "result": "basemetals:nickel_ingot" + "result": { + "id": "basemetals:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json index a2fd6db19..f4b598b67 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:nickel_pressure_plate" + "id": "basemetals:nickel_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate_recycling.json index 14069018b..cd0ae0864 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/nickel_raw_blasting.json index ab8adf416..02b7e4a2c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/nickel" }, - "result": "basemetals:nickel_ingot" + "result": { + "id": "basemetals:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/nickel_raw_crushing.json index 63068ad7c..fda3fcd53 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/nickel" }, "result": { - "item": "basemetals:nickel_powder" + "id": "basemetals:nickel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/nickel_raw_smelting.json index 7683ab23b..4f36516ac 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/nickel" }, - "result": "basemetals:nickel_ingot" + "result": { + "id": "basemetals:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_rod.json b/src/generated/resources/data/basemetals/recipes/nickel_rod.json index af34b13a5..86866a1ce 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:nickel_rod" + "id": "basemetals:nickel_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_rod_recycling.json index 3bc3e5aa4..6d68d63fb 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_scythe.json b/src/generated/resources/data/basemetals/recipes/nickel_scythe.json index e9ae5e079..c27b7adb8 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:nickel_scythe" + "id": "basemetals:nickel_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shears.json b/src/generated/resources/data/basemetals/recipes/nickel_shears.json index 76bfa9961..23c7281d2 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:nickel_shears" + "id": "basemetals:nickel_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_shears_recycling.json index a53273e73..95b03ab6c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shield.json b/src/generated/resources/data/basemetals/recipes/nickel_shield.json index 61be06899..cdde233c6 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:nickel_shield" + "id": "basemetals:nickel_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shovel.json b/src/generated/resources/data/basemetals/recipes/nickel_shovel.json index d453034f4..d93c03879 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:nickel_shovel" + "id": "basemetals:nickel_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_shovel_recycling.json index ac2392a92..6afaeadbe 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_shovel" }, "result": { - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_slab.json b/src/generated/resources/data/basemetals/recipes/nickel_slab.json index 80f27dc2a..d2dd2bc4c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:nickel_slab" + "id": "basemetals:nickel_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_slab_recycling.json index 5ae31a7b1..78d4b4231 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:nickel_nugget" + "id": "basemetals:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json index 66e434314..2a12a1837 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:nickel_smallpowder" + "id": "basemetals:nickel_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/nickel_smallpowder_smelting.json index e97adcd22..2235301f9 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/nickel" }, - "result": "basemetals:nickel_nugget" + "result": { + "id": "basemetals:nickel_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_stairs.json b/src/generated/resources/data/basemetals/recipes/nickel_stairs.json index 696d9ed6d..00dd4ed1c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:nickel_stairs" + "id": "basemetals:nickel_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_sword.json b/src/generated/resources/data/basemetals/recipes/nickel_sword.json index 2b768c1f9..5d849dfa1 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:nickel_sword" + "id": "basemetals:nickel_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_sword_recycling.json index c8f365825..c88beb722 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json index d02cfd73b..5e2b63482 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:nickel_trapdoor" + "id": "basemetals:nickel_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_trapdoor_recycling.json index c40643a9c..b331ff37f 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:nickel_ingot" + "id": "basemetals:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_wall.json b/src/generated/resources/data/basemetals/recipes/nickel_wall.json index 5b921c0c2..12f245fd6 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:nickel_wall" + "id": "basemetals:nickel_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/nickel_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/nickel_wall_recycling.json index 22609e07b..4348779ec 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:nickel_wall" }, "result": { - "item": "basemetals:nickel_block" + "id": "basemetals:nickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json b/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json index 16fdaf0cf..6a97cf228 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:obsidian_arrow" + "id": "basemetals:obsidian_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_arrow_recycling.json index 66655d9a7..694398bc8 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_arrow" }, "result": { - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_axe.json b/src/generated/resources/data/basemetals/recipes/obsidian_axe.json index 47312a859..97499caf4 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_axe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:obsidian_axe" + "id": "basemetals:obsidian_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_axe_recycling.json index 0c1ee8678..a3a5ae62c 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars.json b/src/generated/resources/data/basemetals/recipes/obsidian_bars.json index c26bd5a9b..735c5e21b 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bars.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:obsidian_bars" + "id": "basemetals:obsidian_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json b/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json index 253cf52d8..0886f272f 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:obsidian_bars" + "id": "basemetals:obsidian_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_bars_recycling.json index c62e9e209..0f772ee4d 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_block.json b/src/generated/resources/data/basemetals/recipes/obsidian_block.json index 99a738665..cb7b63d5f 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_block.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "minecraft:obsidian" + "id": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json b/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json index a7d6c4b25..8802f1d78 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:obsidian_bolt" + "id": "basemetals:obsidian_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_bolt_recycling.json index b65ea177f..93af15882 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_boots.json b/src/generated/resources/data/basemetals/recipes/obsidian_boots.json index 998dfb533..2e9ce9c6c 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_boots.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:obsidian_boots" + "id": "basemetals:obsidian_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_boots_recycling.json index 9169b3cea..e02482cfe 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bow.json b/src/generated/resources/data/basemetals/recipes/obsidian_bow.json index 0a2d3f904..5213c5e8d 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bow.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:obsidian_bow" + "id": "basemetals:obsidian_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_bow_recycling.json index 678dd11e2..6ac4e7747 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_bow" }, "result": { - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_button.json b/src/generated/resources/data/basemetals/recipes/obsidian_button.json index 23edfaca6..b887c115f 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_button.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:obsidian_button" + "id": "basemetals:obsidian_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_button_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_button_recycling.json index 8741d4502..d46accf9b 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json b/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json index ba621ed6a..83c60086d 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:obsidian_chestplate" + "id": "basemetals:obsidian_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_chestplate_recycling.json index 6dbf06c3b..2738e51ee 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json index cfeac7b15..b04a0c82d 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:obsidian_crackhammer" + "id": "basemetals:obsidian_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer_recycling.json index 4946f0f17..5d077ffff 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_crackhammer" }, "result": { - "item": "minecraft:obsidian" + "id": "minecraft:obsidian" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json b/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json index fec91a30f..92f60179f 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:obsidian_crossbow" + "id": "basemetals:obsidian_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_crossbow_recycling.json index 3271a34b8..ade06ebab 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crushing.json b/src/generated/resources/data/basemetals/recipes/obsidian_crushing.json index a5742cced..d47fce148 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 4, - "item": "basemetals:obsidian_powder" + "id": "basemetals:obsidian_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_door.json b/src/generated/resources/data/basemetals/recipes/obsidian_door.json index 97801a3c2..902383bd5 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_door.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:obsidian_door" + "id": "basemetals:obsidian_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_door_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_door_recycling.json index 80754a5a6..8ea428e23 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json index 6f639402c..8c113833b 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:obsidian_fishing_rod" + "id": "basemetals:obsidian_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_gear.json b/src/generated/resources/data/basemetals/recipes/obsidian_gear.json index b55f4a482..183d8c403 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_gear.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:obsidian_gear" + "id": "basemetals:obsidian_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_gear_recycling.json index 0e6a6cd37..edec3df74 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_gear" }, "result": { - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json b/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json index 92fa44f96..6bb9754d6 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:obsidian_helmet" + "id": "basemetals:obsidian_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_helmet_recycling.json index 21a4fdd44..38a7cb5ac 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json b/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json index c728b62fd..cba308fa8 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:obsidian_hoe" + "id": "basemetals:obsidian_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_hoe_recycling.json index d2ce793db..d394cef33 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json index 84daad0c3..1a319cbeb 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:obsidian_horse_armor" + "id": "basemetals:obsidian_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json b/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json index 2f6c612fe..c146c13c6 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/obsidian_ingot_crushing.json index 99d296fa5..bbd5fa35b 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/obsidian" }, "result": { - "item": "basemetals:obsidian_powder" + "id": "basemetals:obsidian_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json b/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json index 214e7716d..a08b7ec98 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:obsidian_leggings" + "id": "basemetals:obsidian_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_leggings_recycling.json index f88a68965..3bf19af2f 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_lever.json b/src/generated/resources/data/basemetals/recipes/obsidian_lever.json index 9cbeb2065..365d412b1 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_lever.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:obsidian_lever" + "id": "basemetals:obsidian_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_lever_recycling.json index 671546e90..09f63e04e 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_lever" }, "result": { - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json b/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json index faf540cba..b7c7afbd8 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/obsidian_nugget_crushing.json index 1540ee5f8..fb766c919 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/obsidian" }, "result": { - "item": "basemetals:obsidian_smallpowder" + "id": "basemetals:obsidian_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json index 6f9ee5f0b..561b1968e 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:obsidian_pickaxe" + "id": "basemetals:obsidian_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe_recycling.json index 52c423500..810985422 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json index b29f3fe63..2d3a5d18e 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:obsidian_powder" + "id": "basemetals:obsidian_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/obsidian_powder_smelting.json index fa9a5c250..92e03da94 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/obsidian" }, - "result": "basemetals:obsidian_ingot" + "result": { + "id": "basemetals:obsidian_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json index f333e5c5f..d786de3f3 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:obsidian_pressure_plate" + "id": "basemetals:obsidian_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate_recycling.json index 7af49c9ee..212daf8c2 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_rod.json b/src/generated/resources/data/basemetals/recipes/obsidian_rod.json index c54517652..f7033846f 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_rod.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:obsidian_rod" + "id": "basemetals:obsidian_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_rod_recycling.json index edc41fed0..73bb15ffe 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json b/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json index d07c4220a..a4b59e29a 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:obsidian_scythe" + "id": "basemetals:obsidian_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shears.json b/src/generated/resources/data/basemetals/recipes/obsidian_shears.json index 0f1869a9a..6331b2164 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shears.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:obsidian_shears" + "id": "basemetals:obsidian_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_shears_recycling.json index 4220898d8..4362ad7eb 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shield.json b/src/generated/resources/data/basemetals/recipes/obsidian_shield.json index 868d9f39b..3979077b9 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shield.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:obsidian_shield" + "id": "basemetals:obsidian_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json b/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json index 766282ae9..3ddb292b7 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:obsidian_shovel" + "id": "basemetals:obsidian_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_shovel_recycling.json index 8c1578ed0..2398f661c 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_shovel" }, "result": { - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_slab.json b/src/generated/resources/data/basemetals/recipes/obsidian_slab.json index e4bc85141..4080a37bb 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_slab.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:obsidian_slab" + "id": "basemetals:obsidian_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_slab_recycling.json index 4b5b54bb6..86605c294 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:obsidian_nugget" + "id": "basemetals:obsidian_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json index 10f2f6eed..ffb130f54 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:obsidian_smallpowder" + "id": "basemetals:obsidian_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder_smelting.json index 7a2a02c19..0081eed47 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/obsidian" }, - "result": "basemetals:obsidian_nugget" + "result": { + "id": "basemetals:obsidian_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json b/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json index 8d5262d28..e0d3050f0 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:obsidian_stairs" + "id": "basemetals:obsidian_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_sword.json b/src/generated/resources/data/basemetals/recipes/obsidian_sword.json index c165e183e..c632455cb 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_sword.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:obsidian_sword" + "id": "basemetals:obsidian_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_sword_recycling.json index f5bc57784..d4d9977d8 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json index 617683e59..5a6769a0d 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:obsidian_trapdoor" + "id": "basemetals:obsidian_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor_recycling.json index 6edbcf5e1..8420354d3 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:obsidian_ingot" + "id": "basemetals:obsidian_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_wall.json b/src/generated/resources/data/basemetals/recipes/obsidian_wall.json index abe977f61..55fdad404 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_wall.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:obsidian_wall" + "id": "basemetals:obsidian_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/obsidian_wall_recycling.json index 86fdbc847..766f14db6 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:obsidian_wall" }, "result": { - "item": "minecraft:obsidian" + "id": "minecraft:obsidian" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_arrow.json b/src/generated/resources/data/basemetals/recipes/pewter_arrow.json index 9d8e50d36..c440f4212 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:pewter_arrow" + "id": "basemetals:pewter_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_arrow_recycling.json index 77f13b62b..fb43315ba 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_arrow" }, "result": { - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_axe.json b/src/generated/resources/data/basemetals/recipes/pewter_axe.json index 6d9486509..a506017cb 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_axe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:pewter_axe" + "id": "basemetals:pewter_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_axe_recycling.json index 228898a4a..db2c7128a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars.json b/src/generated/resources/data/basemetals/recipes/pewter_bars.json index de21b2aae..66fab6b47 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bars.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:pewter_bars" + "id": "basemetals:pewter_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json b/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json index d8f01563e..535fef966 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:pewter_bars" + "id": "basemetals:pewter_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_bars_recycling.json index 6a85a4bc1..dcc8eae40 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend.json b/src/generated/resources/data/basemetals/recipes/pewter_blend.json index d05e1fbaf..79dfdcd90 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_blend.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_blend.json @@ -17,7 +17,7 @@ ], "result": { "count": 3, - "item": "basemetals:pewter_blend" + "id": "basemetals:pewter_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json index 76b6770b6..a367f7633 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:pewter_blend" + "id": "basemetals:pewter_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/pewter_blend_smelting.json index 47e3c62f6..dcb85fb9e 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/pewter" }, - "result": "basemetals:pewter_ingot" + "result": { + "id": "basemetals:pewter_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block.json b/src/generated/resources/data/basemetals/recipes/pewter_block.json index 7af1971bf..a0c9d8f55 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_block.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:pewter_block" + "id": "basemetals:pewter_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block_crushing.json b/src/generated/resources/data/basemetals/recipes/pewter_block_crushing.json index 9b52add90..5407d4eaf 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:pewter_powder" + "id": "basemetals:pewter_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json b/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json index 3b7ad4911..e09c81bbf 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bolt.json b/src/generated/resources/data/basemetals/recipes/pewter_bolt.json index 1f0473e13..41917ca1c 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:pewter_bolt" + "id": "basemetals:pewter_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_bolt_recycling.json index e8e398cc6..82ad448fd 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_boots.json b/src/generated/resources/data/basemetals/recipes/pewter_boots.json index f278745ba..98adfacdb 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_boots.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:pewter_boots" + "id": "basemetals:pewter_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_boots_recycling.json index 1551ee450..c19eea3d8 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bow.json b/src/generated/resources/data/basemetals/recipes/pewter_bow.json index 292ab7a6f..2235e5c66 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bow.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:pewter_bow" + "id": "basemetals:pewter_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_bow_recycling.json index ccf8a69bf..3ddb65f4a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_bow" }, "result": { - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_button.json b/src/generated/resources/data/basemetals/recipes/pewter_button.json index 66b03bb1b..26fc71fc8 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_button.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:pewter_button" + "id": "basemetals:pewter_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_button_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_button_recycling.json index 54f623dff..ca5add563 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json b/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json index 74010138b..0268edec1 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:pewter_chestplate" + "id": "basemetals:pewter_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_chestplate_recycling.json index e2607b673..01e3b8690 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json b/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json index 90c087a21..a7929041a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:pewter_crackhammer" + "id": "basemetals:pewter_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_crackhammer_recycling.json index 08707eaeb..49fb2d7d8 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_crackhammer" }, "result": { - "item": "basemetals:pewter_block" + "id": "basemetals:pewter_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json b/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json index 5977a0792..b6db3d322 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:pewter_crossbow" + "id": "basemetals:pewter_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_crossbow_recycling.json index bfa568aaa..3bba8bc17 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_door.json b/src/generated/resources/data/basemetals/recipes/pewter_door.json index 052c91013..b3ac13b06 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_door.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:pewter_door" + "id": "basemetals:pewter_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_door_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_door_recycling.json index d4c2c5c51..6954f0529 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json b/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json index 6e37795b3..9bb679e3a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:pewter_fishing_rod" + "id": "basemetals:pewter_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_gear.json b/src/generated/resources/data/basemetals/recipes/pewter_gear.json index 5443dacaf..d56aa112e 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_gear.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:pewter_gear" + "id": "basemetals:pewter_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_gear_recycling.json index 1b969eb3a..938443386 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_gear" }, "result": { - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_helmet.json b/src/generated/resources/data/basemetals/recipes/pewter_helmet.json index dc007a05f..41f9494e7 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:pewter_helmet" + "id": "basemetals:pewter_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_helmet_recycling.json index 377d2f255..ddec8946a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_hoe.json b/src/generated/resources/data/basemetals/recipes/pewter_hoe.json index 46bf83e78..dae027f3b 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:pewter_hoe" + "id": "basemetals:pewter_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_hoe_recycling.json index 58614a210..89b5b9b31 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json b/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json index 5535bd964..efb104b29 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:pewter_horse_armor" + "id": "basemetals:pewter_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/pewter_ingot_crushing.json index 340714b91..ae9c79eb4 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/pewter" }, "result": { - "item": "basemetals:pewter_powder" + "id": "basemetals:pewter_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json index ff95e9015..24b0699b7 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_leggings.json b/src/generated/resources/data/basemetals/recipes/pewter_leggings.json index bbf8c2f3f..9d33ac00b 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:pewter_leggings" + "id": "basemetals:pewter_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_leggings_recycling.json index e8cce17d8..c1080c78e 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_lever.json b/src/generated/resources/data/basemetals/recipes/pewter_lever.json index 8876853db..67c01f6b9 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_lever.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:pewter_lever" + "id": "basemetals:pewter_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_lever_recycling.json index ae5e329ce..69d60a314 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_lever" }, "result": { - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/pewter_nugget_crushing.json index e4ea25511..668739b40 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/pewter" }, "result": { - "item": "basemetals:pewter_smallpowder" + "id": "basemetals:pewter_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json b/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json index 45e4d81a1..7acdbf2d1 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json b/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json index b1e0ce20e..a6ae8e1d2 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:pewter_pickaxe" + "id": "basemetals:pewter_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_pickaxe_recycling.json index 7d1386fbf..5157cc893 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_plate.json b/src/generated/resources/data/basemetals/recipes/pewter_plate.json index 3d2c40c13..3a8e52931 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_plate.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:pewter_plate" + "id": "basemetals:pewter_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_plate_recycling.json index 70390030f..f67638029 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_plate" }, "result": { - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json index 713e8adb8..a7c08f3de 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:pewter_powder" + "id": "basemetals:pewter_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/pewter_powder_smelting.json index 5bc5fda40..75c801511 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/pewter" }, - "result": "basemetals:pewter_ingot" + "result": { + "id": "basemetals:pewter_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json index 87b69978a..ac73eb8cc 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:pewter_pressure_plate" + "id": "basemetals:pewter_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate_recycling.json index 111c71f8b..9024e7023 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_rod.json b/src/generated/resources/data/basemetals/recipes/pewter_rod.json index 932d17f96..da1f49074 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_rod.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:pewter_rod" + "id": "basemetals:pewter_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_rod_recycling.json index 52e7477b9..a81fc944a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_scythe.json b/src/generated/resources/data/basemetals/recipes/pewter_scythe.json index 40a5fb2e7..7d33c1ea5 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:pewter_scythe" + "id": "basemetals:pewter_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shears.json b/src/generated/resources/data/basemetals/recipes/pewter_shears.json index 864f3b128..8472d4b49 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shears.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:pewter_shears" + "id": "basemetals:pewter_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_shears_recycling.json index e9ca516b0..1af8a0efd 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shield.json b/src/generated/resources/data/basemetals/recipes/pewter_shield.json index cc445e06d..a27441ef8 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shield.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:pewter_shield" + "id": "basemetals:pewter_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shovel.json b/src/generated/resources/data/basemetals/recipes/pewter_shovel.json index 19fce7604..e74ed7e1c 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:pewter_shovel" + "id": "basemetals:pewter_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_shovel_recycling.json index 5586a08f9..927b19168 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_shovel" }, "result": { - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_slab.json b/src/generated/resources/data/basemetals/recipes/pewter_slab.json index 239c17a7d..636236c84 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_slab.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:pewter_slab" + "id": "basemetals:pewter_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_slab_recycling.json index 6a8b27760..4a33ee930 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:pewter_nugget" + "id": "basemetals:pewter_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json b/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json index 273c9aa06..ec09069a5 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:pewter_smallblend" + "id": "basemetals:pewter_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/pewter_smallblend_smelting.json index daa38910e..26d26914a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/pewter" }, - "result": "basemetals:pewter_nugget" + "result": { + "id": "basemetals:pewter_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json b/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json index eefb7717d..30f5b7858 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:pewter_smallpowder" + "id": "basemetals:pewter_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/pewter_smallpowder_smelting.json index 2a6b7cadd..b2ce01a70 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/pewter" }, - "result": "basemetals:pewter_nugget" + "result": { + "id": "basemetals:pewter_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_stairs.json b/src/generated/resources/data/basemetals/recipes/pewter_stairs.json index d394492c8..aee2d0942 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:pewter_stairs" + "id": "basemetals:pewter_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_sword.json b/src/generated/resources/data/basemetals/recipes/pewter_sword.json index 5f3c91ff6..3c40d453b 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_sword.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:pewter_sword" + "id": "basemetals:pewter_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_sword_recycling.json index 62ab9ade2..8352ef6ee 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json b/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json index e387fed5d..bafc80874 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:pewter_trapdoor" + "id": "basemetals:pewter_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_trapdoor_recycling.json index 126ef715e..9cb06ca17 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:pewter_ingot" + "id": "basemetals:pewter_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_wall.json b/src/generated/resources/data/basemetals/recipes/pewter_wall.json index 4ce8bc0a0..273d62064 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_wall.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:pewter_wall" + "id": "basemetals:pewter_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/pewter_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/pewter_wall_recycling.json index 22ed5a205..8f54a32bb 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:pewter_wall" }, "result": { - "item": "basemetals:pewter_block" + "id": "basemetals:pewter_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/piston.json b/src/generated/resources/data/basemetals/recipes/piston.json index c2c567d4c..81ad97e8c 100644 --- a/src/generated/resources/data/basemetals/recipes/piston.json +++ b/src/generated/resources/data/basemetals/recipes/piston.json @@ -24,7 +24,7 @@ "CRC" ], "result": { - "item": "minecraft:piston" + "id": "minecraft:piston" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_arrow.json b/src/generated/resources/data/basemetals/recipes/platinum_arrow.json index 77c850554..c947d42d2 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:platinum_arrow" + "id": "basemetals:platinum_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_arrow_recycling.json index a1edbfe0b..c9ffb8a1a 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_arrow" }, "result": { - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_axe.json b/src/generated/resources/data/basemetals/recipes/platinum_axe.json index b766a9814..54bd2cf75 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_axe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:platinum_axe" + "id": "basemetals:platinum_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_axe_recycling.json index 34c6868c5..9d1980a32 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars.json b/src/generated/resources/data/basemetals/recipes/platinum_bars.json index a99f4f7df..aa6538f2f 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bars.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:platinum_bars" + "id": "basemetals:platinum_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json b/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json index 72dab481a..d00a1a88e 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:platinum_bars" + "id": "basemetals:platinum_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_bars_recycling.json index 1460bb6da..aa621d1e3 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block.json b/src/generated/resources/data/basemetals/recipes/platinum_block.json index 8f1eea0ab..a15da1469 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_block.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:platinum_block" + "id": "basemetals:platinum_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block_crushing.json b/src/generated/resources/data/basemetals/recipes/platinum_block_crushing.json index 5e38d9ba7..cffa42431 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:platinum_powder" + "id": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json b/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json index b7c3f8046..dcff02e36 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bolt.json b/src/generated/resources/data/basemetals/recipes/platinum_bolt.json index 733a07adc..e29946f4e 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:platinum_bolt" + "id": "basemetals:platinum_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_bolt_recycling.json index c02c0e52a..6d58dfd49 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_boots.json b/src/generated/resources/data/basemetals/recipes/platinum_boots.json index 95f5a47bc..10b40e377 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_boots.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:platinum_boots" + "id": "basemetals:platinum_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_boots_recycling.json index 59fe98d94..7dfcf3cbd 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bow.json b/src/generated/resources/data/basemetals/recipes/platinum_bow.json index 91a6856bb..dd749f650 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bow.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:platinum_bow" + "id": "basemetals:platinum_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_bow_recycling.json index 2dcab2ddf..5f2695ac1 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_bow" }, "result": { - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_button.json b/src/generated/resources/data/basemetals/recipes/platinum_button.json index e85240726..903528a1a 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_button.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:platinum_button" + "id": "basemetals:platinum_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_button_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_button_recycling.json index 08886bcbd..9cf382530 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json b/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json index 4edbe8a0b..414e790e9 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:platinum_chestplate" + "id": "basemetals:platinum_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_chestplate_recycling.json index c53380b49..1786a4390 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json b/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json index a110f229e..1d1a2e362 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:platinum_crackhammer" + "id": "basemetals:platinum_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_crackhammer_recycling.json index 3ec51196f..5db393ea3 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_crackhammer" }, "result": { - "item": "basemetals:platinum_block" + "id": "basemetals:platinum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json b/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json index a0ad9ef48..d32d9358e 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:platinum_crossbow" + "id": "basemetals:platinum_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_crossbow_recycling.json index 16a2d4eb8..1b1e8e77e 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_door.json b/src/generated/resources/data/basemetals/recipes/platinum_door.json index dee2acddf..f8170bb0c 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_door.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:platinum_door" + "id": "basemetals:platinum_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_door_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_door_recycling.json index 2cf7e5af1..1cb40f9cd 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json b/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json index 65832a2e4..303c860f3 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:platinum_fishing_rod" + "id": "basemetals:platinum_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_gear.json b/src/generated/resources/data/basemetals/recipes/platinum_gear.json index d3e9a1ab4..8a72c05b4 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_gear.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:platinum_gear" + "id": "basemetals:platinum_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_gear_recycling.json index a74a38bb6..a48580b77 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_gear" }, "result": { - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_helmet.json b/src/generated/resources/data/basemetals/recipes/platinum_helmet.json index 7edb6ad77..370926157 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:platinum_helmet" + "id": "basemetals:platinum_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_helmet_recycling.json index 1779396d6..be9c6cba6 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_hoe.json b/src/generated/resources/data/basemetals/recipes/platinum_hoe.json index 236a9fa16..6f401ed4f 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:platinum_hoe" + "id": "basemetals:platinum_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_hoe_recycling.json index 5751dc79f..6274d99af 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json b/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json index b7fc11aba..a2440fcd9 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:platinum_horse_armor" + "id": "basemetals:platinum_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/platinum_ingot_crushing.json index 40dea29aa..1a114b0ce 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/platinum" }, "result": { - "item": "basemetals:platinum_powder" + "id": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json index ea84d8489..e02a1de51 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_leggings.json b/src/generated/resources/data/basemetals/recipes/platinum_leggings.json index 66b32d0d6..5d363de81 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:platinum_leggings" + "id": "basemetals:platinum_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_leggings_recycling.json index dce954de2..8bbeb4ec9 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_lever.json b/src/generated/resources/data/basemetals/recipes/platinum_lever.json index ffbf082bd..a9a202116 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_lever.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:platinum_lever" + "id": "basemetals:platinum_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_lever_recycling.json index 6af12fcff..cb16aaca3 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_lever" }, "result": { - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/platinum_nugget_crushing.json index ba1f6b34d..3b55b9f35 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/platinum" }, "result": { - "item": "basemetals:platinum_smallpowder" + "id": "basemetals:platinum_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json b/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json index 65d1beef3..c0a83b036 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/platinum_ore_blasting.json index aa47160f0..2f94c3263 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/platinum" }, - "result": "basemetals:platinum_ingot" + "result": { + "id": "basemetals:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/platinum_ore_crushing.json index 6d0589e6c..bfee6a32b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_powder" + "id": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/platinum_ore_smelting.json index 7bfa3b3b3..7c3f03372 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/platinum" }, - "result": "basemetals:platinum_ingot" + "result": { + "id": "basemetals:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json b/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json index e1e86daab..9dcddb382 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:platinum_pickaxe" + "id": "basemetals:platinum_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_pickaxe_recycling.json index 9e3bd33c9..69374bae9 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_plate.json b/src/generated/resources/data/basemetals/recipes/platinum_plate.json index 461ee8a4b..58bb0da39 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_plate.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:platinum_plate" + "id": "basemetals:platinum_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_plate_recycling.json index 790aa24a8..294e56f97 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_plate" }, "result": { - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json index 57dbeb998..c5608d528 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:platinum_powder" + "id": "basemetals:platinum_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/platinum_powder_smelting.json index c8787077c..203f408a3 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/platinum" }, - "result": "basemetals:platinum_ingot" + "result": { + "id": "basemetals:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json index 8cea0b466..771afc1a1 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:platinum_pressure_plate" + "id": "basemetals:platinum_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate_recycling.json index 35a29e17c..81f30b328 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/platinum_raw_blasting.json index 8f44826f4..c4d42f77d 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/platinum" }, - "result": "basemetals:platinum_ingot" + "result": { + "id": "basemetals:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/platinum_raw_crushing.json index bc15c9c52..e2f974490 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/platinum" }, "result": { - "item": "basemetals:platinum_powder" + "id": "basemetals:platinum_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/platinum_raw_smelting.json index bdef687bf..446181c1d 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/platinum" }, - "result": "basemetals:platinum_ingot" + "result": { + "id": "basemetals:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_rod.json b/src/generated/resources/data/basemetals/recipes/platinum_rod.json index 3546538dc..b01c1b3f8 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_rod.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:platinum_rod" + "id": "basemetals:platinum_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_rod_recycling.json index de6f5aabb..858c0b198 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_scythe.json b/src/generated/resources/data/basemetals/recipes/platinum_scythe.json index 578b4d924..db0bd67f2 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:platinum_scythe" + "id": "basemetals:platinum_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shears.json b/src/generated/resources/data/basemetals/recipes/platinum_shears.json index 0d48f9d56..962f53e4f 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shears.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:platinum_shears" + "id": "basemetals:platinum_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_shears_recycling.json index e4926ef24..db586a7f5 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shield.json b/src/generated/resources/data/basemetals/recipes/platinum_shield.json index 25d655a49..9f3992448 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shield.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:platinum_shield" + "id": "basemetals:platinum_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shovel.json b/src/generated/resources/data/basemetals/recipes/platinum_shovel.json index b18ad2637..3ec2d74b5 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:platinum_shovel" + "id": "basemetals:platinum_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_shovel_recycling.json index 7f1bd511d..dd713b696 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_shovel" }, "result": { - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_slab.json b/src/generated/resources/data/basemetals/recipes/platinum_slab.json index f4d170149..bbf76fe4f 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_slab.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:platinum_slab" + "id": "basemetals:platinum_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_slab_recycling.json index d406f9b4d..6d940ea0b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:platinum_nugget" + "id": "basemetals:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json b/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json index 095ef5d25..8730d911c 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:platinum_smallpowder" + "id": "basemetals:platinum_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/platinum_smallpowder_smelting.json index ea086d4d3..c441c8da6 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/platinum" }, - "result": "basemetals:platinum_nugget" + "result": { + "id": "basemetals:platinum_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_stairs.json b/src/generated/resources/data/basemetals/recipes/platinum_stairs.json index f6ba607f8..13c32102f 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:platinum_stairs" + "id": "basemetals:platinum_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_sword.json b/src/generated/resources/data/basemetals/recipes/platinum_sword.json index b3a661b6c..5e02a4135 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_sword.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:platinum_sword" + "id": "basemetals:platinum_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_sword_recycling.json index 6904d69aa..cb9d33e92 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json b/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json index 26db64965..968d0372d 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:platinum_trapdoor" + "id": "basemetals:platinum_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_trapdoor_recycling.json index 07af052cd..9be543975 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:platinum_ingot" + "id": "basemetals:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_wall.json b/src/generated/resources/data/basemetals/recipes/platinum_wall.json index d7d3232e0..a1cf98b84 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_wall.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:platinum_wall" + "id": "basemetals:platinum_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/platinum_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/platinum_wall_recycling.json index d6fe54173..08870d12b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:platinum_wall" }, "result": { - "item": "basemetals:platinum_block" + "id": "basemetals:platinum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/prismarine_bricks_crushing.json b/src/generated/resources/data/basemetals/recipes/prismarine_bricks_crushing.json index 5a0835084..9071cd083 100644 --- a/src/generated/resources/data/basemetals/recipes/prismarine_bricks_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/prismarine_bricks_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "minecraft:prismarine_shard" + "id": "minecraft:prismarine_shard" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/prismarine_crushing.json b/src/generated/resources/data/basemetals/recipes/prismarine_crushing.json index 98b23a527..a60fcdf98 100644 --- a/src/generated/resources/data/basemetals/recipes/prismarine_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/prismarine_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 4, - "item": "minecraft:prismarine_shard" + "id": "minecraft:prismarine_shard" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_arrow.json b/src/generated/resources/data/basemetals/recipes/quartz_arrow.json index 5d92f5bee..720d0ad84 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:quartz_arrow" + "id": "basemetals:quartz_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_arrow_recycling.json index 071ce3807..98f173117 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_arrow" }, "result": { - "item": "basemetals:quartz_nugget" + "id": "basemetals:quartz_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_axe.json b/src/generated/resources/data/basemetals/recipes/quartz_axe.json index 201c7ae2a..5932b5e93 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_axe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:quartz_axe" + "id": "basemetals:quartz_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_axe_recycling.json index a74b791a4..1d29c9873 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars.json b/src/generated/resources/data/basemetals/recipes/quartz_bars.json index 777f876b5..65b25e970 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bars.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:quartz_bars" + "id": "basemetals:quartz_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json b/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json index fcc9147be..ebe0d0881 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:quartz_bars" + "id": "basemetals:quartz_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_bars_recycling.json index 5dc3509df..05d9673fb 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:quartz_nugget" + "id": "basemetals:quartz_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_block_crushing.json b/src/generated/resources/data/basemetals/recipes/quartz_block_crushing.json index b9ce31f76..ede0137b9 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 4, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bolt.json b/src/generated/resources/data/basemetals/recipes/quartz_bolt.json index 70218c13e..4b162ecb1 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:quartz_bolt" + "id": "basemetals:quartz_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_bolt_recycling.json index 526b466b3..af13b6f8d 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:quartz_nugget" + "id": "basemetals:quartz_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_boots.json b/src/generated/resources/data/basemetals/recipes/quartz_boots.json index 954d3d51a..2a3a4fa5f 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_boots.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:quartz_boots" + "id": "basemetals:quartz_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_boots_recycling.json index c69e86c4e..39bb6175c 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bow.json b/src/generated/resources/data/basemetals/recipes/quartz_bow.json index ceb78df00..13de24e41 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bow.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:quartz_bow" + "id": "basemetals:quartz_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_bow_recycling.json index 96c3f8122..5a3e168d0 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_bow" }, "result": { - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_button.json b/src/generated/resources/data/basemetals/recipes/quartz_button.json index a22bb1122..59dbf273e 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_button.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:quartz_button" + "id": "basemetals:quartz_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_button_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_button_recycling.json index eecee8125..34f79efa2 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:quartz_nugget" + "id": "basemetals:quartz_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json b/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json index 89bd80ac1..bf9dacdcf 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:quartz_chestplate" + "id": "basemetals:quartz_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_chestplate_recycling.json index ee86c437d..c987abea1 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json b/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json index f341bdc46..cb4997654 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:quartz_crackhammer" + "id": "basemetals:quartz_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_crackhammer_recycling.json index 50de90d36..9657724c7 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_crackhammer" }, "result": { - "item": "minecraft:quartz_block" + "id": "minecraft:quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json b/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json index 5af638ce4..f2b68a65d 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:quartz_crossbow" + "id": "basemetals:quartz_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_crossbow_recycling.json index 2848a47c4..f2ef4203a 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crushing.json b/src/generated/resources/data/basemetals/recipes/quartz_crushing.json index 09ad6619f..72de8713f 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:quartz" }, "result": { - "item": "basemetals:quartz_powder" + "id": "basemetals:quartz_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_door.json b/src/generated/resources/data/basemetals/recipes/quartz_door.json index 0348f6ee0..31dac9013 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_door.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:quartz_door" + "id": "basemetals:quartz_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_door_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_door_recycling.json index 1a2d704a5..3c76c5c4b 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json b/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json index c225ec0a5..ae76a4ac3 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:quartz_fishing_rod" + "id": "basemetals:quartz_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_gear.json b/src/generated/resources/data/basemetals/recipes/quartz_gear.json index eeb6e8917..566405bd0 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_gear.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:quartz_gear" + "id": "basemetals:quartz_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_gear_recycling.json index 863a7d448..a60b7e457 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_gear" }, "result": { - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_helmet.json b/src/generated/resources/data/basemetals/recipes/quartz_helmet.json index c7892688e..d110913ba 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:quartz_helmet" + "id": "basemetals:quartz_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_helmet_recycling.json index 9f475c840..8302488af 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_hoe.json b/src/generated/resources/data/basemetals/recipes/quartz_hoe.json index 440bc02da..2b122dcbf 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:quartz_hoe" + "id": "basemetals:quartz_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_hoe_recycling.json index f08402f62..47b520796 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json b/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json index 138d60c83..e46f5c588 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:quartz_horse_armor" + "id": "basemetals:quartz_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_ingot.json b/src/generated/resources/data/basemetals/recipes/quartz_ingot.json index fef49aa54..91ac6a0ed 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_ingot.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_leggings.json b/src/generated/resources/data/basemetals/recipes/quartz_leggings.json index b890bfce4..2046cf276 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:quartz_leggings" + "id": "basemetals:quartz_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_leggings_recycling.json index 96e09da83..942ea355c 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_lever.json b/src/generated/resources/data/basemetals/recipes/quartz_lever.json index 22f958c97..15cea3ae2 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_lever.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:quartz_lever" + "id": "basemetals:quartz_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_lever_recycling.json index bd704501b..59e58c7cc 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_lever" }, "result": { - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_nugget.json b/src/generated/resources/data/basemetals/recipes/quartz_nugget.json index d4abbaa34..c451f8649 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_nugget.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:quartz_nugget" + "id": "basemetals:quartz_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/quartz_nugget_crushing.json index 9bdc57743..25493a342 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/quartz" }, "result": { - "item": "basemetals:quartz_smallpowder" + "id": "basemetals:quartz_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/quartz_ore_crushing.json index c79b1f852..d4ef7a3f4 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json b/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json index 14c6d67ae..3c74b97f0 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:quartz_pickaxe" + "id": "basemetals:quartz_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_pickaxe_recycling.json index 821febe9d..35545d42a 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json index 456dfc13d..7e30c497b 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:quartz_powder" + "id": "basemetals:quartz_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/quartz_powder_smelting.json index b32ea3a7c..0dbdbfb52 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/quartz" }, - "result": "minecraft:quartz" + "result": { + "id": "minecraft:quartz" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json index 43fc1e943..ec9c96fbe 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:quartz_pressure_plate" + "id": "basemetals:quartz_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate_recycling.json index 9036f47e1..755657879 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_rod.json b/src/generated/resources/data/basemetals/recipes/quartz_rod.json index ac2949f9e..f40992bb2 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_rod.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:quartz_rod" + "id": "basemetals:quartz_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_rod_recycling.json index fb0a36a3e..feafbaff8 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:quartz_nugget" + "id": "basemetals:quartz_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_scythe.json b/src/generated/resources/data/basemetals/recipes/quartz_scythe.json index 90ba8ff39..3860e0e4d 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:quartz_scythe" + "id": "basemetals:quartz_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shears.json b/src/generated/resources/data/basemetals/recipes/quartz_shears.json index 2e06a6f4b..4b70dae82 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shears.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:quartz_shears" + "id": "basemetals:quartz_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_shears_recycling.json index f70e8267a..d1d49fffb 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shield.json b/src/generated/resources/data/basemetals/recipes/quartz_shield.json index 24c016c97..71fe4b817 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shield.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:quartz_shield" + "id": "basemetals:quartz_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shovel.json b/src/generated/resources/data/basemetals/recipes/quartz_shovel.json index b0a603370..885fcf7d8 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:quartz_shovel" + "id": "basemetals:quartz_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_shovel_recycling.json index beb05a95e..67ea26095 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_shovel" }, "result": { - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_slab_crushing.json b/src/generated/resources/data/basemetals/recipes/quartz_slab_crushing.json index 40d33fd92..3f0bd94a4 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_slab_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json b/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json index 7c7d84c11..b6ac171ac 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:quartz_smallpowder" + "id": "basemetals:quartz_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/quartz_smallpowder_smelting.json index 93b08510e..0bfb65eb1 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/quartz" }, - "result": "basemetals:quartz_nugget" + "result": { + "id": "basemetals:quartz_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_sword.json b/src/generated/resources/data/basemetals/recipes/quartz_sword.json index f32f73238..fee4aff50 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_sword.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:quartz_sword" + "id": "basemetals:quartz_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_sword_recycling.json index 6f719d4de..791684761 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json b/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json index c473d1326..59e42879a 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:quartz_trapdoor" + "id": "basemetals:quartz_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_trapdoor_recycling.json index 644a3e843..b3f4f2a13 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_wall.json b/src/generated/resources/data/basemetals/recipes/quartz_wall.json index 0bf3d5782..74b5e5fb8 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_wall.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:quartz_wall" + "id": "basemetals:quartz_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/quartz_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/quartz_wall_recycling.json index 3835a7080..2e63e3ed5 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:quartz_wall" }, "result": { - "item": "minecraft:quartz_block" + "id": "minecraft:quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/rail.json b/src/generated/resources/data/basemetals/recipes/rail.json index 83dfcf86a..6c09e9226 100644 --- a/src/generated/resources/data/basemetals/recipes/rail.json +++ b/src/generated/resources/data/basemetals/recipes/rail.json @@ -19,7 +19,7 @@ ], "result": { "count": 16, - "item": "minecraft:rail" + "id": "minecraft:rail" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/red_sandstone_crushing.json b/src/generated/resources/data/basemetals/recipes/red_sandstone_crushing.json index 05c4da4ae..d96c14b85 100644 --- a/src/generated/resources/data/basemetals/recipes/red_sandstone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/red_sandstone_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 4, - "item": "minecraft:red_sand" + "id": "minecraft:red_sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/red_sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipes/red_sandstone_slab_crushing.json index 535ae1e91..364e94645 100644 --- a/src/generated/resources/data/basemetals/recipes/red_sandstone_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/red_sandstone_slab_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:red_sand" + "id": "minecraft:red_sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/redstone_block_crushing.json b/src/generated/resources/data/basemetals/recipes/redstone_block_crushing.json index d6412f476..a669dcee2 100644 --- a/src/generated/resources/data/basemetals/recipes/redstone_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/redstone_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "minecraft:redstone" + "id": "minecraft:redstone" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json index f642a9e22..2ad6f53e8 100644 --- a/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "minecraft:redstone" + "id": "minecraft:redstone" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/redstone_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/redstone_ore_crushing.json index 839a5f14b..5ef8bf6d9 100644 --- a/src/generated/resources/data/basemetals/recipes/redstone_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/redstone_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 8, - "item": "minecraft:redstone" + "id": "minecraft:redstone" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json b/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json index 74aa8aff0..3eec62157 100644 --- a/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:redstone_smallpowder" + "id": "basemetals:redstone_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/sandstone_crushing.json b/src/generated/resources/data/basemetals/recipes/sandstone_crushing.json index ec555128c..8faa491ae 100644 --- a/src/generated/resources/data/basemetals/recipes/sandstone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/sandstone_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 4, - "item": "minecraft:sand" + "id": "minecraft:sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/sandstone_slab_crushing.json b/src/generated/resources/data/basemetals/recipes/sandstone_slab_crushing.json index 3dde1b739..45a093147 100644 --- a/src/generated/resources/data/basemetals/recipes/sandstone_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/sandstone_slab_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:sand" + "id": "minecraft:sand" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/sea_lantern_crushing.json b/src/generated/resources/data/basemetals/recipes/sea_lantern_crushing.json index b9afcdad2..5fa01cb86 100644 --- a/src/generated/resources/data/basemetals/recipes/sea_lantern_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/sea_lantern_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 5, - "item": "minecraft:prismarine_crystals" + "id": "minecraft:prismarine_crystals" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_arrow.json b/src/generated/resources/data/basemetals/recipes/silver_arrow.json index 39cf53c5c..3c8810484 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/silver_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:silver_arrow" + "id": "basemetals:silver_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_arrow_recycling.json index 33d3a7401..5c763fe0a 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_arrow" }, "result": { - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_axe.json b/src/generated/resources/data/basemetals/recipes/silver_axe.json index b3e5225bf..0f21db278 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_axe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:silver_axe" + "id": "basemetals:silver_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_axe_recycling.json index d5f932eb0..3277391c4 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars.json b/src/generated/resources/data/basemetals/recipes/silver_bars.json index 0cfe09b1f..7a3a96290 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bars.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:silver_bars" + "id": "basemetals:silver_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars_2.json b/src/generated/resources/data/basemetals/recipes/silver_bars_2.json index 27bc90529..45fcca1cd 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:silver_bars" + "id": "basemetals:silver_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_bars_recycling.json index e051bacba..ddf69ba96 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_block.json b/src/generated/resources/data/basemetals/recipes/silver_block.json index e54e60929..baa06760d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_block.json +++ b/src/generated/resources/data/basemetals/recipes/silver_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:silver_block" + "id": "basemetals:silver_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_block_crushing.json b/src/generated/resources/data/basemetals/recipes/silver_block_crushing.json index 106211f0e..cdb687e83 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/silver_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:silver_powder" + "id": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json b/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json index 054f6dfd9..65d0ca438 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bolt.json b/src/generated/resources/data/basemetals/recipes/silver_bolt.json index a7528e9e7..c2e7106ae 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:silver_bolt" + "id": "basemetals:silver_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_bolt_recycling.json index 35a608678..c5b401f6d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_boots.json b/src/generated/resources/data/basemetals/recipes/silver_boots.json index b8a2285f8..41b4e5292 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_boots.json +++ b/src/generated/resources/data/basemetals/recipes/silver_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:silver_boots" + "id": "basemetals:silver_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_boots_recycling.json index c363a8369..95f7508cf 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bow.json b/src/generated/resources/data/basemetals/recipes/silver_bow.json index 1ec945337..2ce1d0d73 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bow.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:silver_bow" + "id": "basemetals:silver_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_bow_recycling.json index 55ad3eefe..d87d2decc 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_bow" }, "result": { - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_button.json b/src/generated/resources/data/basemetals/recipes/silver_button.json index 5fa28cf75..8282fe2db 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_button.json +++ b/src/generated/resources/data/basemetals/recipes/silver_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:silver_button" + "id": "basemetals:silver_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_button_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_button_recycling.json index 909321d8e..f2fbbdd3e 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_chestplate.json b/src/generated/resources/data/basemetals/recipes/silver_chestplate.json index 1fbacbc72..924fb7557 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/silver_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:silver_chestplate" + "id": "basemetals:silver_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_chestplate_recycling.json index abf9a1eae..3a16a0c90 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json b/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json index d0ac5de50..fbc595a51 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:silver_crackhammer" + "id": "basemetals:silver_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_crackhammer_recycling.json index 9827093fc..a816407de 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_crackhammer" }, "result": { - "item": "basemetals:silver_block" + "id": "basemetals:silver_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_crossbow.json b/src/generated/resources/data/basemetals/recipes/silver_crossbow.json index dd98c2f1d..2c4a4eaa7 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/silver_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:silver_crossbow" + "id": "basemetals:silver_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_crossbow_recycling.json index 51f521ebe..c28f3fc83 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_door.json b/src/generated/resources/data/basemetals/recipes/silver_door.json index f919bfa12..b27acf9f4 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_door.json +++ b/src/generated/resources/data/basemetals/recipes/silver_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:silver_door" + "id": "basemetals:silver_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_door_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_door_recycling.json index 340c33e95..2b861a745 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json b/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json index a6ef05ac5..647fdbbad 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:silver_fishing_rod" + "id": "basemetals:silver_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_gear.json b/src/generated/resources/data/basemetals/recipes/silver_gear.json index b6e1c3a04..d918ee336 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_gear.json +++ b/src/generated/resources/data/basemetals/recipes/silver_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:silver_gear" + "id": "basemetals:silver_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_gear_recycling.json index eb3e6efc4..975b588a8 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_gear" }, "result": { - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_helmet.json b/src/generated/resources/data/basemetals/recipes/silver_helmet.json index 43c11eca4..7f5177af3 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/silver_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:silver_helmet" + "id": "basemetals:silver_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_helmet_recycling.json index 748bfc505..0503be018 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_hoe.json b/src/generated/resources/data/basemetals/recipes/silver_hoe.json index a1f8f5870..ed7878179 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:silver_hoe" + "id": "basemetals:silver_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_hoe_recycling.json index 1697edc5f..ca9dd882a 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json b/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json index e16661461..2ee54efce 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:silver_horse_armor" + "id": "basemetals:silver_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/silver_ingot_crushing.json index 37549dbb7..bda56254a 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/silver_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/silver" }, "result": { - "item": "basemetals:silver_powder" + "id": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json index e20f8dffb..391f23127 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_leggings.json b/src/generated/resources/data/basemetals/recipes/silver_leggings.json index f2bfd4037..7ad6d4385 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/silver_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:silver_leggings" + "id": "basemetals:silver_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_leggings_recycling.json index 634d7c421..962bb9015 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_lever.json b/src/generated/resources/data/basemetals/recipes/silver_lever.json index 6f88edad2..274189ba1 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_lever.json +++ b/src/generated/resources/data/basemetals/recipes/silver_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:silver_lever" + "id": "basemetals:silver_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_lever_recycling.json index 4a25a1876..b07ff5829 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_lever" }, "result": { - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/silver_nugget_crushing.json index da2970ae2..2d8d544b9 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/silver_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/silver" }, "result": { - "item": "basemetals:silver_smallpowder" + "id": "basemetals:silver_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_nuggets.json b/src/generated/resources/data/basemetals/recipes/silver_nuggets.json index bb09b54cc..2ea383d9d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/silver_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/silver_ore_blasting.json index fcc405dc2..d59ac6d0f 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/silver_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/silver" }, - "result": "basemetals:silver_ingot" + "result": { + "id": "basemetals:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/silver_ore_crushing.json index 4fa031dad..c6dd52a3d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/silver_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_powder" + "id": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/silver_ore_smelting.json index 14a83db7f..b7620ff14 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/silver_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/silver" }, - "result": "basemetals:silver_ingot" + "result": { + "id": "basemetals:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json b/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json index aca0d0c40..fe44fbbbe 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:silver_pickaxe" + "id": "basemetals:silver_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_pickaxe_recycling.json index 3f1617c91..d2cb64cd9 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_plate.json b/src/generated/resources/data/basemetals/recipes/silver_plate.json index a3f861e66..3745ebecc 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_plate.json +++ b/src/generated/resources/data/basemetals/recipes/silver_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:silver_plate" + "id": "basemetals:silver_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_plate_recycling.json index 209c42717..2ad56b11d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_plate" }, "result": { - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json index d53b71e6b..4bdebfae1 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:silver_powder" + "id": "basemetals:silver_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/silver_powder_smelting.json index b7bc33d49..8de6238d4 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/silver_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/silver" }, - "result": "basemetals:silver_ingot" + "result": { + "id": "basemetals:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json index 2fe3b3b34..334992705 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:silver_pressure_plate" + "id": "basemetals:silver_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_pressure_plate_recycling.json index eb21fa107..65d5b1b2f 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/silver_raw_blasting.json index b94505dc4..8377e0cd1 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/silver_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/silver" }, - "result": "basemetals:silver_ingot" + "result": { + "id": "basemetals:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/silver_raw_crushing.json index 2164d19ae..cff4ba56c 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/silver_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/silver" }, "result": { - "item": "basemetals:silver_powder" + "id": "basemetals:silver_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/silver_raw_smelting.json index ea751df81..f430aefc5 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/silver_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/silver" }, - "result": "basemetals:silver_ingot" + "result": { + "id": "basemetals:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_rod.json b/src/generated/resources/data/basemetals/recipes/silver_rod.json index e8e10f380..3dbf9990f 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_rod.json +++ b/src/generated/resources/data/basemetals/recipes/silver_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:silver_rod" + "id": "basemetals:silver_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_rod_recycling.json index 1f15c563c..d9683dbdc 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_scythe.json b/src/generated/resources/data/basemetals/recipes/silver_scythe.json index 09f5aafde..0152183a6 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:silver_scythe" + "id": "basemetals:silver_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_shears.json b/src/generated/resources/data/basemetals/recipes/silver_shears.json index f373f3dc3..eb5c3dbcd 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shears.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:silver_shears" + "id": "basemetals:silver_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_shears_recycling.json index 39fa9ce2c..dd65ab0f0 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_shield.json b/src/generated/resources/data/basemetals/recipes/silver_shield.json index 99900b4e4..e089d0acc 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shield.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:silver_shield" + "id": "basemetals:silver_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_shovel.json b/src/generated/resources/data/basemetals/recipes/silver_shovel.json index aa75abbd5..246ed84e8 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:silver_shovel" + "id": "basemetals:silver_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_shovel_recycling.json index 300e72841..8fd232a24 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_shovel" }, "result": { - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_slab.json b/src/generated/resources/data/basemetals/recipes/silver_slab.json index 29d5ab8d6..34af70d28 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_slab.json +++ b/src/generated/resources/data/basemetals/recipes/silver_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:silver_slab" + "id": "basemetals:silver_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_slab_recycling.json index f3d3ce0dd..e44daec0a 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:silver_nugget" + "id": "basemetals:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json b/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json index ec76a2316..5a4c2e8d2 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:silver_smallpowder" + "id": "basemetals:silver_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/silver_smallpowder_smelting.json index 3fb7ee62d..82f3e9922 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/silver_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/silver" }, - "result": "basemetals:silver_nugget" + "result": { + "id": "basemetals:silver_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_stairs.json b/src/generated/resources/data/basemetals/recipes/silver_stairs.json index aeaf5f2df..25b4180fd 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/silver_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:silver_stairs" + "id": "basemetals:silver_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_sword.json b/src/generated/resources/data/basemetals/recipes/silver_sword.json index 54ad20164..4e0bb6c40 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_sword.json +++ b/src/generated/resources/data/basemetals/recipes/silver_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:silver_sword" + "id": "basemetals:silver_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_sword_recycling.json index 4975961ee..e2f2460d5 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json b/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json index 335b31fde..18eb2ea53 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:silver_trapdoor" + "id": "basemetals:silver_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_trapdoor_recycling.json index d329b8765..f19fb5adb 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:silver_ingot" + "id": "basemetals:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_wall.json b/src/generated/resources/data/basemetals/recipes/silver_wall.json index ea2292041..25143b20d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_wall.json +++ b/src/generated/resources/data/basemetals/recipes/silver_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:silver_wall" + "id": "basemetals:silver_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/silver_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/silver_wall_recycling.json index ac4b2b928..d5b877913 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/silver_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:silver_wall" }, "result": { - "item": "basemetals:silver_block" + "id": "basemetals:silver_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/slime_block_crushing.json b/src/generated/resources/data/basemetals/recipes/slime_block_crushing.json index b6cdd7e24..5aa4ccd20 100644 --- a/src/generated/resources/data/basemetals/recipes/slime_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/slime_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "minecraft:slime_ball" + "id": "minecraft:slime_ball" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json b/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json index ee6135bf1..81f49e457 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:starsteel_arrow" + "id": "basemetals:starsteel_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_arrow_recycling.json index 0d99b207c..daab6bcc7 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_arrow" }, "result": { - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_axe.json b/src/generated/resources/data/basemetals/recipes/starsteel_axe.json index d07329bd9..dbf18589f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:starsteel_axe" + "id": "basemetals:starsteel_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_axe_recycling.json index a4b4b3fff..69552dc2c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars.json b/src/generated/resources/data/basemetals/recipes/starsteel_bars.json index b16a1ffdc..e5a085fba 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:starsteel_bars" + "id": "basemetals:starsteel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json b/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json index 8fdf588a9..36c2c814c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:starsteel_bars" + "id": "basemetals:starsteel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_bars_recycling.json index 230d721ce..0457e1980 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block.json b/src/generated/resources/data/basemetals/recipes/starsteel_block.json index 556c08aa7..d2a2b2461 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_block.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:starsteel_block" + "id": "basemetals:starsteel_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block_crushing.json b/src/generated/resources/data/basemetals/recipes/starsteel_block_crushing.json index 262c83a98..cabffc120 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:starsteel_powder" + "id": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json index d0c5d471e..14aef9a75 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json b/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json index 76a4bb04e..ed57da496 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:starsteel_bolt" + "id": "basemetals:starsteel_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_bolt_recycling.json index e8df21f73..d8909d3ee 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_boots.json b/src/generated/resources/data/basemetals/recipes/starsteel_boots.json index 97e75e71f..21d7dfd9c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:starsteel_boots" + "id": "basemetals:starsteel_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_boots_recycling.json index 273ead0a1..21a075182 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bow.json b/src/generated/resources/data/basemetals/recipes/starsteel_bow.json index af74a478c..433d24d9d 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:starsteel_bow" + "id": "basemetals:starsteel_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_bow_recycling.json index 3761ad963..2e28ff402 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_bow" }, "result": { - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_button.json b/src/generated/resources/data/basemetals/recipes/starsteel_button.json index a0e24b62d..e127b748d 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_button.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:starsteel_button" + "id": "basemetals:starsteel_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_button_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_button_recycling.json index f7ef3444d..e1b08912f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json b/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json index 11c2237e2..b827315d2 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:starsteel_chestplate" + "id": "basemetals:starsteel_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_chestplate_recycling.json index 6b55c5dad..cb23cf0a7 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json index a4d335567..9784d4307 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:starsteel_crackhammer" + "id": "basemetals:starsteel_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer_recycling.json index 40564f7ed..88d21ada7 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_crackhammer" }, "result": { - "item": "basemetals:starsteel_block" + "id": "basemetals:starsteel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json b/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json index 5ab61f46b..c00b7c928 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:starsteel_crossbow" + "id": "basemetals:starsteel_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_crossbow_recycling.json index abf5b68d2..94ecd4e73 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_door.json b/src/generated/resources/data/basemetals/recipes/starsteel_door.json index 429aaa40e..a9b6857e0 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_door.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:starsteel_door" + "id": "basemetals:starsteel_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_door_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_door_recycling.json index 3a56e610c..592e5c599 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json index 2b08649f0..7c4463eb6 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:starsteel_fishing_rod" + "id": "basemetals:starsteel_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_gear.json b/src/generated/resources/data/basemetals/recipes/starsteel_gear.json index b49b181d9..03527d2d0 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:starsteel_gear" + "id": "basemetals:starsteel_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_gear_recycling.json index 9b02be744..69102313f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_gear" }, "result": { - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json b/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json index f388e98bf..cd0ea7131 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:starsteel_helmet" + "id": "basemetals:starsteel_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_helmet_recycling.json index f961562c3..fb87c558e 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json b/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json index 068847ead..25a3d1f77 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:starsteel_hoe" + "id": "basemetals:starsteel_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_hoe_recycling.json index 777ec2f04..3439326c1 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json index b7799228e..8584368dc 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:starsteel_horse_armor" + "id": "basemetals:starsteel_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/starsteel_ingot_crushing.json index deadfcdb3..a0d8af573 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/starsteel" }, "result": { - "item": "basemetals:starsteel_powder" + "id": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json index 51d42cee5..21d211669 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json b/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json index 50a09782b..06960d6b6 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:starsteel_leggings" + "id": "basemetals:starsteel_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_leggings_recycling.json index 16bfa3e84..38f135741 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_lever.json b/src/generated/resources/data/basemetals/recipes/starsteel_lever.json index 4ab711949..9d01091de 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:starsteel_lever" + "id": "basemetals:starsteel_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_lever_recycling.json index 360a2cfd8..5fa89af6c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_lever" }, "result": { - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/starsteel_nugget_crushing.json index bed1c2ab9..00b5d062e 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/starsteel" }, "result": { - "item": "basemetals:starsteel_smallpowder" + "id": "basemetals:starsteel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json b/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json index 40dcd0a39..5e1ca11d5 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/starsteel_ore_blasting.json index 47d72beb6..d8216ff22 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/starsteel" }, - "result": "basemetals:starsteel_ingot" + "result": { + "id": "basemetals:starsteel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/starsteel_ore_crushing.json index 7949fcef3..cf8ab2809 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_powder" + "id": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/starsteel_ore_smelting.json index ccb286b00..484bbda9c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/starsteel" }, - "result": "basemetals:starsteel_ingot" + "result": { + "id": "basemetals:starsteel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json index b4c19bfd9..bad71a913 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:starsteel_pickaxe" + "id": "basemetals:starsteel_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe_recycling.json index 4616f54ea..8e26b3e5f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_plate.json b/src/generated/resources/data/basemetals/recipes/starsteel_plate.json index 46081e6e8..db5a856d0 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:starsteel_plate" + "id": "basemetals:starsteel_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_plate_recycling.json index 9ae70f249..eda1d3898 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_plate" }, "result": { - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json index d05c8f14c..c557ca480 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:starsteel_powder" + "id": "basemetals:starsteel_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/starsteel_powder_smelting.json index 3b644c11d..3a2036ce4 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/starsteel" }, - "result": "basemetals:starsteel_ingot" + "result": { + "id": "basemetals:starsteel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json index 57da72ff3..1a3a9235d 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:starsteel_pressure_plate" + "id": "basemetals:starsteel_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate_recycling.json index a6c0140cb..03a10c507 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/starsteel_raw_blasting.json index 81b6f9088..ead7b8c27 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/starsteel" }, - "result": "basemetals:starsteel_ingot" + "result": { + "id": "basemetals:starsteel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/starsteel_raw_crushing.json index ed40be122..52597c670 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/starsteel" }, "result": { - "item": "basemetals:starsteel_powder" + "id": "basemetals:starsteel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/starsteel_raw_smelting.json index 6c7642811..6d8597c61 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/starsteel" }, - "result": "basemetals:starsteel_ingot" + "result": { + "id": "basemetals:starsteel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_rod.json b/src/generated/resources/data/basemetals/recipes/starsteel_rod.json index f4e166336..1eac9aaa2 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:starsteel_rod" + "id": "basemetals:starsteel_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_rod_recycling.json index ca9a1d072..10c8d53a7 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json b/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json index 80a7a5bb9..d10701e53 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:starsteel_scythe" + "id": "basemetals:starsteel_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shears.json b/src/generated/resources/data/basemetals/recipes/starsteel_shears.json index c02ffa679..b661e7ff2 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:starsteel_shears" + "id": "basemetals:starsteel_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_shears_recycling.json index bdbb98009..7820b7981 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shield.json b/src/generated/resources/data/basemetals/recipes/starsteel_shield.json index af19234fc..3c037d87f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:starsteel_shield" + "id": "basemetals:starsteel_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json b/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json index 644a1c155..a4ba6b74f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:starsteel_shovel" + "id": "basemetals:starsteel_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_shovel_recycling.json index 6e52c16e3..ed1c264de 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_shovel" }, "result": { - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_slab.json b/src/generated/resources/data/basemetals/recipes/starsteel_slab.json index 31da67825..e670be270 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:starsteel_slab" + "id": "basemetals:starsteel_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_slab_recycling.json index 180980b5c..7d8466dfa 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:starsteel_nugget" + "id": "basemetals:starsteel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json index 8b2fed439..164fa4971 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:starsteel_smallpowder" + "id": "basemetals:starsteel_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder_smelting.json index ed40768e8..f8734f471 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/starsteel" }, - "result": "basemetals:starsteel_nugget" + "result": { + "id": "basemetals:starsteel_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json b/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json index a06858a80..a1d3c3a57 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:starsteel_stairs" + "id": "basemetals:starsteel_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_sword.json b/src/generated/resources/data/basemetals/recipes/starsteel_sword.json index 83f35ecdd..c8104bc3e 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:starsteel_sword" + "id": "basemetals:starsteel_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_sword_recycling.json index 5818cd9ab..972daabb3 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json index 861d22f9a..116f491b5 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:starsteel_trapdoor" + "id": "basemetals:starsteel_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor_recycling.json index ca0b88892..97f4751a7 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:starsteel_ingot" + "id": "basemetals:starsteel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_wall.json b/src/generated/resources/data/basemetals/recipes/starsteel_wall.json index 243066302..7c6f4c54c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:starsteel_wall" + "id": "basemetals:starsteel_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/starsteel_wall_recycling.json index 26563527a..fd1f3450b 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:starsteel_wall" }, "result": { - "item": "basemetals:starsteel_block" + "id": "basemetals:starsteel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_anvil.json b/src/generated/resources/data/basemetals/recipes/steel_anvil.json index 1a0de41e5..95cbdf6da 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_anvil.json +++ b/src/generated/resources/data/basemetals/recipes/steel_anvil.json @@ -18,7 +18,7 @@ "III" ], "result": { - "item": "basemetals:steel_anvil" + "id": "basemetals:steel_anvil" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_arrow.json b/src/generated/resources/data/basemetals/recipes/steel_arrow.json index ec54d31fc..0e7f21929 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/steel_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:steel_arrow" + "id": "basemetals:steel_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_arrow_recycling.json index 4f068f431..6fde5d003 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_arrow" }, "result": { - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_axe.json b/src/generated/resources/data/basemetals/recipes/steel_axe.json index 01f63f0cf..23b2287ba 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:steel_axe" + "id": "basemetals:steel_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_axe_recycling.json index 5ff506135..2d6311d96 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars.json b/src/generated/resources/data/basemetals/recipes/steel_bars.json index 11685a840..48357dc40 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:steel_bars" + "id": "basemetals:steel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars_2.json b/src/generated/resources/data/basemetals/recipes/steel_bars_2.json index 483013488..ff17a0f60 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:steel_bars" + "id": "basemetals:steel_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_bars_recycling.json index d1509d004..74625f12e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend.json b/src/generated/resources/data/basemetals/recipes/steel_blend.json index 641d4244a..14aea5934 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_blend.json +++ b/src/generated/resources/data/basemetals/recipes/steel_blend.json @@ -35,7 +35,7 @@ ], "result": { "count": 8, - "item": "basemetals:steel_blend" + "id": "basemetals:steel_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json index ab573572e..56a991b44 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:steel_blend" + "id": "basemetals:steel_blend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend_smelting.json b/src/generated/resources/data/basemetals/recipes/steel_blend_smelting.json index 2135fd98f..c79109b26 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_blend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/steel_blend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:blends/steel" }, - "result": "basemetals:steel_ingot" + "result": { + "id": "basemetals:steel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_block.json b/src/generated/resources/data/basemetals/recipes/steel_block.json index 33341fcc2..376556b96 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_block.json +++ b/src/generated/resources/data/basemetals/recipes/steel_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:steel_block" + "id": "basemetals:steel_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_block_crushing.json b/src/generated/resources/data/basemetals/recipes/steel_block_crushing.json index 7dbb58497..366797e02 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/steel_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:steel_powder" + "id": "basemetals:steel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json index 3ce60b679..c891f4690 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bolt.json b/src/generated/resources/data/basemetals/recipes/steel_bolt.json index 95ebcf9f5..6b22d8800 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:steel_bolt" + "id": "basemetals:steel_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_bolt_recycling.json index e639573ca..f8770306c 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_boots.json b/src/generated/resources/data/basemetals/recipes/steel_boots.json index 642a0f495..dca964bad 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/steel_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:steel_boots" + "id": "basemetals:steel_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_boots_recycling.json index a07692cec..e2c6f6581 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bow.json b/src/generated/resources/data/basemetals/recipes/steel_bow.json index 32eaf446e..c72f016b0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:steel_bow" + "id": "basemetals:steel_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_bow_recycling.json index 1736e3354..eb60e4049 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_bow" }, "result": { - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_button.json b/src/generated/resources/data/basemetals/recipes/steel_button.json index 502d2eaa2..470650346 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_button.json +++ b/src/generated/resources/data/basemetals/recipes/steel_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:steel_button" + "id": "basemetals:steel_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_button_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_button_recycling.json index 42044aa8a..ce07d239e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_chestplate.json b/src/generated/resources/data/basemetals/recipes/steel_chestplate.json index 0481e8846..db1a6f235 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/steel_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:steel_chestplate" + "id": "basemetals:steel_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_chestplate_recycling.json index ba4532c29..11385e938 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json index 23a2d7bec..9a237b6ef 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:steel_crackhammer" + "id": "basemetals:steel_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_crackhammer_recycling.json index 8fa984578..bf59e5ea5 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_crackhammer" }, "result": { - "item": "basemetals:steel_block" + "id": "basemetals:steel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_crossbow.json b/src/generated/resources/data/basemetals/recipes/steel_crossbow.json index e1be91ee5..4b3d721cc 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/steel_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:steel_crossbow" + "id": "basemetals:steel_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_crossbow_recycling.json index e99fc75f5..9403e0a90 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_door.json b/src/generated/resources/data/basemetals/recipes/steel_door.json index 28bc8dac0..af3b55f7a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_door.json +++ b/src/generated/resources/data/basemetals/recipes/steel_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:steel_door" + "id": "basemetals:steel_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_door_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_door_recycling.json index 210942c56..79c433799 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json index e2d63fa78..7ab639441 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:steel_fishing_rod" + "id": "basemetals:steel_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_gear.json b/src/generated/resources/data/basemetals/recipes/steel_gear.json index 7b654a909..db2dbaa2d 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/steel_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:steel_gear" + "id": "basemetals:steel_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_gear_recycling.json index cd8a3abd5..b48c89665 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_gear" }, "result": { - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_helmet.json b/src/generated/resources/data/basemetals/recipes/steel_helmet.json index efdd1198a..2edfcb938 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/steel_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:steel_helmet" + "id": "basemetals:steel_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_helmet_recycling.json index ff3253382..3c300e8ab 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_hoe.json b/src/generated/resources/data/basemetals/recipes/steel_hoe.json index e47337b17..d030b3075 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:steel_hoe" + "id": "basemetals:steel_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_hoe_recycling.json index d5a1e79e6..e435c345e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json index 45fe359e6..fb40077d0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:steel_horse_armor" + "id": "basemetals:steel_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/steel_ingot_crushing.json index bde25eea1..6cd51a59c 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/steel_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/steel" }, "result": { - "item": "basemetals:steel_powder" + "id": "basemetals:steel_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json index d189f2f7d..71bc21ef0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_leggings.json b/src/generated/resources/data/basemetals/recipes/steel_leggings.json index 0dcb40cb0..bcc0a7d57 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/steel_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:steel_leggings" + "id": "basemetals:steel_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_leggings_recycling.json index 86b15521c..f7ca3261e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_lever.json b/src/generated/resources/data/basemetals/recipes/steel_lever.json index b3bcee9d6..823fa9f75 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/steel_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:steel_lever" + "id": "basemetals:steel_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_lever_recycling.json index 1acf5c188..6cefd0b8d 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_lever" }, "result": { - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/steel_nugget_crushing.json index 1564c33c1..dc5166b05 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/steel_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/steel" }, "result": { - "item": "basemetals:steel_smallpowder" + "id": "basemetals:steel_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_nuggets.json b/src/generated/resources/data/basemetals/recipes/steel_nuggets.json index d69eb047e..4d81a67f0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/steel_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json index b86b3c790..93b1b5400 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:steel_pickaxe" + "id": "basemetals:steel_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_pickaxe_recycling.json index 3c388104a..0e3b49154 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_plate.json b/src/generated/resources/data/basemetals/recipes/steel_plate.json index 0da154108..96727bef4 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/steel_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:steel_plate" + "id": "basemetals:steel_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_plate_recycling.json index 008da8e36..a1d89bc86 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_plate" }, "result": { - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json index a69f8f679..0d450a843 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:steel_powder" + "id": "basemetals:steel_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/steel_powder_smelting.json index dac6447b7..c289b1baf 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/steel_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/steel" }, - "result": "basemetals:steel_ingot" + "result": { + "id": "basemetals:steel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json index 82882b39f..c5f09013b 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:steel_pressure_plate" + "id": "basemetals:steel_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_pressure_plate_recycling.json index 144f8116e..0f5b9ca2e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_rod.json b/src/generated/resources/data/basemetals/recipes/steel_rod.json index af8ed1557..383f02586 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/steel_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:steel_rod" + "id": "basemetals:steel_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_rod_recycling.json index da860bc52..0528e3980 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_scythe.json b/src/generated/resources/data/basemetals/recipes/steel_scythe.json index 1e57278ba..5504757d7 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:steel_scythe" + "id": "basemetals:steel_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_shears.json b/src/generated/resources/data/basemetals/recipes/steel_shears.json index 17e836561..3db865488 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:steel_shears" + "id": "basemetals:steel_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_shears_recycling.json index be3869987..16d6ebb2e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_shield.json b/src/generated/resources/data/basemetals/recipes/steel_shield.json index f0300752b..4228927d5 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:steel_shield" + "id": "basemetals:steel_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_shovel.json b/src/generated/resources/data/basemetals/recipes/steel_shovel.json index 8ccb98e93..233ede944 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:steel_shovel" + "id": "basemetals:steel_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_shovel_recycling.json index e6b7fb009..ffb9a7d9a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_shovel" }, "result": { - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_slab.json b/src/generated/resources/data/basemetals/recipes/steel_slab.json index 059ca88a0..bab801af6 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/steel_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:steel_slab" + "id": "basemetals:steel_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_slab_recycling.json index 6de8ab1c5..655999b4a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:steel_nugget" + "id": "basemetals:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallblend.json b/src/generated/resources/data/basemetals/recipes/steel_smallblend.json index a1d2b5cf8..6a95d00c2 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/steel_smallblend.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:steel_smallblend" + "id": "basemetals:steel_smallblend" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallblend_smelting.json b/src/generated/resources/data/basemetals/recipes/steel_smallblend_smelting.json index b37141820..0f54c2dd4 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_smallblend_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/steel_smallblend_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:small_blends/steel" }, - "result": "basemetals:steel_nugget" + "result": { + "id": "basemetals:steel_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json index 29f3ee93b..6e2da29ea 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:steel_smallpowder" + "id": "basemetals:steel_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/steel_smallpowder_smelting.json index 198c38d0e..f542c822b 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/steel_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/steel" }, - "result": "basemetals:steel_nugget" + "result": { + "id": "basemetals:steel_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_stairs.json b/src/generated/resources/data/basemetals/recipes/steel_stairs.json index 7cf61210a..2078ec097 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/steel_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:steel_stairs" + "id": "basemetals:steel_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_sword.json b/src/generated/resources/data/basemetals/recipes/steel_sword.json index 293043af4..328ea204e 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/steel_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:steel_sword" + "id": "basemetals:steel_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_sword_recycling.json index 897bf08cb..db9cf984a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json index a4319ea4b..785709ddb 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:steel_trapdoor" + "id": "basemetals:steel_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_trapdoor_recycling.json index 62a1b9a30..384bb4704 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:steel_ingot" + "id": "basemetals:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_wall.json b/src/generated/resources/data/basemetals/recipes/steel_wall.json index 973337b30..4ad176a9b 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/steel_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:steel_wall" + "id": "basemetals:steel_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/steel_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/steel_wall_recycling.json index 7edb01e1a..81323fda3 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/steel_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:steel_wall" }, "result": { - "item": "basemetals:steel_block" + "id": "basemetals:steel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_anvil.json b/src/generated/resources/data/basemetals/recipes/stone_anvil.json index 3382bba45..b1aa31f0b 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_anvil.json +++ b/src/generated/resources/data/basemetals/recipes/stone_anvil.json @@ -21,7 +21,7 @@ "SSS" ], "result": { - "item": "basemetals:stone_anvil" + "id": "basemetals:stone_anvil" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_brick_slab_crushing.json b/src/generated/resources/data/basemetals/recipes/stone_brick_slab_crushing.json index 67b0f2e3e..91dc85f77 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_brick_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/stone_brick_slab_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:stone_brick_slab" }, "result": { - "item": "minecraft:cobblestone_slab" + "id": "minecraft:cobblestone_slab" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_bricks_crushing.json b/src/generated/resources/data/basemetals/recipes/stone_bricks_crushing.json index b805c20fc..06b389321 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_bricks_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/stone_bricks_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:stone_bricks" }, "result": { - "item": "minecraft:cobblestone" + "id": "minecraft:cobblestone" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json b/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json index f2d197228..d367832e4 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:stone_crackhammer" + "id": "basemetals:stone_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_crushing.json b/src/generated/resources/data/basemetals/recipes/stone_crushing.json index c3b62df85..cc0afa14c 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/stone_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:stone" }, "result": { - "item": "minecraft:cobblestone" + "id": "minecraft:cobblestone" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_scythe.json b/src/generated/resources/data/basemetals/recipes/stone_scythe.json index 90f910f97..57402d72e 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/stone_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:stone_scythe" + "id": "basemetals:stone_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/stone_slab_crushing.json b/src/generated/resources/data/basemetals/recipes/stone_slab_crushing.json index c4ef2296b..1f9e8f969 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_slab_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/stone_slab_crushing.json @@ -4,6 +4,6 @@ "item": "minecraft:stone_slab" }, "result": { - "item": "minecraft:cobblestone_slab" + "id": "minecraft:cobblestone_slab" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/sugar_cane_crushing.json b/src/generated/resources/data/basemetals/recipes/sugar_cane_crushing.json index 685688740..ac06da241 100644 --- a/src/generated/resources/data/basemetals/recipes/sugar_cane_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/sugar_cane_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "minecraft:sugar" + "id": "minecraft:sugar" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_arrow.json b/src/generated/resources/data/basemetals/recipes/tin_arrow.json index 4660d2a9f..551d3bf7e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/tin_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:tin_arrow" + "id": "basemetals:tin_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_arrow_recycling.json index 4897dda78..6814c30bf 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_arrow" }, "result": { - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_axe.json b/src/generated/resources/data/basemetals/recipes/tin_axe.json index e08dd826a..5fe22b904 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_axe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:tin_axe" + "id": "basemetals:tin_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_axe_recycling.json index 651fe920b..707ce8925 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars.json b/src/generated/resources/data/basemetals/recipes/tin_bars.json index e991557bf..4628193bf 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bars.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:tin_bars" + "id": "basemetals:tin_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars_2.json b/src/generated/resources/data/basemetals/recipes/tin_bars_2.json index 7d54e99d3..1dde6d408 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:tin_bars" + "id": "basemetals:tin_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_bars_recycling.json index 363b4b0f5..917ad8da0 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_block.json b/src/generated/resources/data/basemetals/recipes/tin_block.json index 66c84adee..4efbac6e8 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_block.json +++ b/src/generated/resources/data/basemetals/recipes/tin_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:tin_block" + "id": "basemetals:tin_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_block_crushing.json b/src/generated/resources/data/basemetals/recipes/tin_block_crushing.json index 040fbb15b..52af9a8d4 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/tin_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:tin_powder" + "id": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json b/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json index 5fada3687..35f799650 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bolt.json b/src/generated/resources/data/basemetals/recipes/tin_bolt.json index e2edcca99..2ac23678b 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:tin_bolt" + "id": "basemetals:tin_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_bolt_recycling.json index 32b010275..da2aa4eb1 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_boots.json b/src/generated/resources/data/basemetals/recipes/tin_boots.json index 86617e9ee..e3870be96 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_boots.json +++ b/src/generated/resources/data/basemetals/recipes/tin_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:tin_boots" + "id": "basemetals:tin_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_boots_recycling.json index 289eb0e79..9d7d89efd 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bow.json b/src/generated/resources/data/basemetals/recipes/tin_bow.json index cf05ebce3..6cf01be31 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bow.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:tin_bow" + "id": "basemetals:tin_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_bow_recycling.json index 1becc96ad..2d9db7874 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_bow" }, "result": { - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_button.json b/src/generated/resources/data/basemetals/recipes/tin_button.json index 765bc27f6..ad6002b70 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_button.json +++ b/src/generated/resources/data/basemetals/recipes/tin_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:tin_button" + "id": "basemetals:tin_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_button_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_button_recycling.json index db03f7417..e21eee27f 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_chestplate.json b/src/generated/resources/data/basemetals/recipes/tin_chestplate.json index dce21e8bd..fec28fd9d 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/tin_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:tin_chestplate" + "id": "basemetals:tin_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_chestplate_recycling.json index 0d170250f..a5bec4eb4 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json b/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json index f38692436..5cc370b31 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:tin_crackhammer" + "id": "basemetals:tin_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_crackhammer_recycling.json index 6aaa9593e..65c2b40d3 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_crackhammer" }, "result": { - "item": "basemetals:tin_block" + "id": "basemetals:tin_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_crossbow.json b/src/generated/resources/data/basemetals/recipes/tin_crossbow.json index 65f6d511e..3d2be0952 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/tin_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:tin_crossbow" + "id": "basemetals:tin_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_crossbow_recycling.json index 0385cd7b5..9738e4146 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_door.json b/src/generated/resources/data/basemetals/recipes/tin_door.json index 150ada352..df2e218f0 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_door.json +++ b/src/generated/resources/data/basemetals/recipes/tin_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:tin_door" + "id": "basemetals:tin_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_door_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_door_recycling.json index 1bb9dac5c..cf6b7dc34 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json b/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json index 5c2ecae64..4b7cce2f2 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:tin_fishing_rod" + "id": "basemetals:tin_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_gear.json b/src/generated/resources/data/basemetals/recipes/tin_gear.json index ab677e3b8..064e0d86c 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_gear.json +++ b/src/generated/resources/data/basemetals/recipes/tin_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:tin_gear" + "id": "basemetals:tin_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_gear_recycling.json index 1308b4131..523d3f3ed 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_gear" }, "result": { - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_helmet.json b/src/generated/resources/data/basemetals/recipes/tin_helmet.json index c66c41a36..c3577f1da 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/tin_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:tin_helmet" + "id": "basemetals:tin_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_helmet_recycling.json index 4da821f88..d51083a03 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_hoe.json b/src/generated/resources/data/basemetals/recipes/tin_hoe.json index 9affa1bb2..bc0c40db2 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:tin_hoe" + "id": "basemetals:tin_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_hoe_recycling.json index 2b90468a0..3f66875d5 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json b/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json index 4ddbea73b..99ca37cf7 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:tin_horse_armor" + "id": "basemetals:tin_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/tin_ingot_crushing.json index 421a45906..05d937799 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/tin_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/tin" }, "result": { - "item": "basemetals:tin_powder" + "id": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json index 92d29235a..ba531003d 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_leggings.json b/src/generated/resources/data/basemetals/recipes/tin_leggings.json index fbceeba54..dba836fb3 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/tin_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:tin_leggings" + "id": "basemetals:tin_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_leggings_recycling.json index eb77b6882..d85713d8e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_lever.json b/src/generated/resources/data/basemetals/recipes/tin_lever.json index cd2b295ba..c01ba4baa 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_lever.json +++ b/src/generated/resources/data/basemetals/recipes/tin_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:tin_lever" + "id": "basemetals:tin_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_lever_recycling.json index 0a1151329..c8f5b63a2 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_lever" }, "result": { - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/tin_nugget_crushing.json index 32d9adaa3..76d5e424b 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/tin_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/tin" }, "result": { - "item": "basemetals:tin_smallpowder" + "id": "basemetals:tin_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_nuggets.json b/src/generated/resources/data/basemetals/recipes/tin_nuggets.json index 170372f67..48d408ce2 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/tin_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/tin_ore_blasting.json index 7f77ffa6b..4526facfa 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/tin_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/tin" }, - "result": "basemetals:tin_ingot" + "result": { + "id": "basemetals:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/tin_ore_crushing.json index 0c402e386..8935fda50 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/tin_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_powder" + "id": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/tin_ore_smelting.json index 3804fee9d..cc1f94298 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/tin_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/tin" }, - "result": "basemetals:tin_ingot" + "result": { + "id": "basemetals:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json b/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json index fff07d966..8f4c0e298 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:tin_pickaxe" + "id": "basemetals:tin_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_pickaxe_recycling.json index f5fd91d38..2c562ccdc 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_plate.json b/src/generated/resources/data/basemetals/recipes/tin_plate.json index 567b7ed16..8d22c9f56 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_plate.json +++ b/src/generated/resources/data/basemetals/recipes/tin_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:tin_plate" + "id": "basemetals:tin_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_plate_recycling.json index 83b99ccad..b91d118fa 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_plate" }, "result": { - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json index a6ac742dd..96a20e0ae 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:tin_powder" + "id": "basemetals:tin_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/tin_powder_smelting.json index aac6f61ba..9a8f281ad 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/tin_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/tin" }, - "result": "basemetals:tin_ingot" + "result": { + "id": "basemetals:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json index 0ca59d4bf..8ab7c9a88 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:tin_pressure_plate" + "id": "basemetals:tin_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_pressure_plate_recycling.json index 6d3ce463b..f0f885c56 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/tin_raw_blasting.json index 8e88ca28b..197aaff18 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/tin_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/tin" }, - "result": "basemetals:tin_ingot" + "result": { + "id": "basemetals:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/tin_raw_crushing.json index daf3d5e23..e54ad7b4d 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/tin_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/tin" }, "result": { - "item": "basemetals:tin_powder" + "id": "basemetals:tin_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/tin_raw_smelting.json index eeff30aac..bc0dc1eee 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/tin_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/tin" }, - "result": "basemetals:tin_ingot" + "result": { + "id": "basemetals:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_rod.json b/src/generated/resources/data/basemetals/recipes/tin_rod.json index cb443ecca..8c9d3ea3e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_rod.json +++ b/src/generated/resources/data/basemetals/recipes/tin_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:tin_rod" + "id": "basemetals:tin_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_rod_recycling.json index 311887338..b3838aba5 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_scythe.json b/src/generated/resources/data/basemetals/recipes/tin_scythe.json index c019f5f82..358772923 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:tin_scythe" + "id": "basemetals:tin_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_shears.json b/src/generated/resources/data/basemetals/recipes/tin_shears.json index 37db9e3a0..2417eda8e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shears.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:tin_shears" + "id": "basemetals:tin_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_shears_recycling.json index 645b811cf..60d0e8137 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_shield.json b/src/generated/resources/data/basemetals/recipes/tin_shield.json index ed189886b..96abf45b1 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shield.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:tin_shield" + "id": "basemetals:tin_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_shovel.json b/src/generated/resources/data/basemetals/recipes/tin_shovel.json index c0df4d333..1edf6911c 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:tin_shovel" + "id": "basemetals:tin_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_shovel_recycling.json index ae87a7fa5..0f3cdf00e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_shovel" }, "result": { - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_slab.json b/src/generated/resources/data/basemetals/recipes/tin_slab.json index cf68f10e0..46352d0f2 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_slab.json +++ b/src/generated/resources/data/basemetals/recipes/tin_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:tin_slab" + "id": "basemetals:tin_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_slab_recycling.json index 6756531fe..41b23a7b1 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:tin_nugget" + "id": "basemetals:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json b/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json index 28d1398e6..05c75c841 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:tin_smallpowder" + "id": "basemetals:tin_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/tin_smallpowder_smelting.json index 87d59b755..dc41bbd92 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/tin_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/tin" }, - "result": "basemetals:tin_nugget" + "result": { + "id": "basemetals:tin_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_stairs.json b/src/generated/resources/data/basemetals/recipes/tin_stairs.json index 57baf098c..d5182bbfd 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/tin_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:tin_stairs" + "id": "basemetals:tin_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_sword.json b/src/generated/resources/data/basemetals/recipes/tin_sword.json index 453c66367..c80f39df3 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_sword.json +++ b/src/generated/resources/data/basemetals/recipes/tin_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:tin_sword" + "id": "basemetals:tin_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_sword_recycling.json index 91275e274..39c569564 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json b/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json index ac94d3aae..50df747e3 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:tin_trapdoor" + "id": "basemetals:tin_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_trapdoor_recycling.json index 9e3d04dce..7512eaaeb 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:tin_ingot" + "id": "basemetals:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_wall.json b/src/generated/resources/data/basemetals/recipes/tin_wall.json index 210284454..e49603b38 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_wall.json +++ b/src/generated/resources/data/basemetals/recipes/tin_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:tin_wall" + "id": "basemetals:tin_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tin_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/tin_wall_recycling.json index bf0a6f86d..f94d82b5b 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/tin_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:tin_wall" }, "result": { - "item": "basemetals:tin_block" + "id": "basemetals:tin_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/tripwire_hook.json b/src/generated/resources/data/basemetals/recipes/tripwire_hook.json index 8848a0e4a..f34f6be9b 100644 --- a/src/generated/resources/data/basemetals/recipes/tripwire_hook.json +++ b/src/generated/resources/data/basemetals/recipes/tripwire_hook.json @@ -21,7 +21,7 @@ "W" ], "result": { - "item": "minecraft:tripwire_hook" + "id": "minecraft:tripwire_hook" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json b/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json index 11e91c27f..116ff8cab 100644 --- a/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:wood_crackhammer" + "id": "basemetals:wood_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/wood_scythe.json b/src/generated/resources/data/basemetals/recipes/wood_scythe.json index 650c43193..077f38473 100644 --- a/src/generated/resources/data/basemetals/recipes/wood_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/wood_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:wood_scythe" + "id": "basemetals:wood_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_arrow.json b/src/generated/resources/data/basemetals/recipes/zinc_arrow.json index 65af0dd49..58b288945 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_arrow.json @@ -22,7 +22,7 @@ ], "result": { "count": 4, - "item": "basemetals:zinc_arrow" + "id": "basemetals:zinc_arrow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_arrow_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_arrow_recycling.json index 1d1b3a032..ff2ab3f69 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_arrow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_arrow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_arrow" }, "result": { - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_axe.json b/src/generated/resources/data/basemetals/recipes/zinc_axe.json index 731ee41ad..fe4b50493 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_axe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_axe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:zinc_axe" + "id": "basemetals:zinc_axe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_axe_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_axe_recycling.json index f1da458b0..91c721c5f 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_axe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_axe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars.json b/src/generated/resources/data/basemetals/recipes/zinc_bars.json index 0071d9f36..2031e9af9 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bars.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bars.json @@ -15,7 +15,7 @@ ], "result": { "count": 16, - "item": "basemetals:zinc_bars" + "id": "basemetals:zinc_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json b/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json index d62abca26..c8ef4b5d6 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json @@ -14,7 +14,7 @@ ], "result": { "count": 4, - "item": "basemetals:zinc_bars" + "id": "basemetals:zinc_bars" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_bars_recycling.json index 8047de3d2..10d56a30c 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bars_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bars_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block.json b/src/generated/resources/data/basemetals/recipes/zinc_block.json index 7eb7f4b4c..120855838 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_block.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_block.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:zinc_block" + "id": "basemetals:zinc_block" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block_crushing.json b/src/generated/resources/data/basemetals/recipes/zinc_block_crushing.json index e5db23f1c..d2dfd5ecf 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_block_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_block_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 9, - "item": "basemetals:zinc_powder" + "id": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json b/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json index da017eb09..be0583523 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bolt.json b/src/generated/resources/data/basemetals/recipes/zinc_bolt.json index 3afa52e43..fbfadb3b4 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bolt.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:zinc_bolt" + "id": "basemetals:zinc_bolt" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bolt_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_bolt_recycling.json index c37940deb..659c76f3d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bolt_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bolt_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_boots.json b/src/generated/resources/data/basemetals/recipes/zinc_boots.json index 9c3fdd185..e42f08aca 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_boots.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_boots.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:zinc_boots" + "id": "basemetals:zinc_boots" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_boots_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_boots_recycling.json index 4ae833158..4dedb4444 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_boots_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_boots_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bow.json b/src/generated/resources/data/basemetals/recipes/zinc_bow.json index ad1027419..2298877f4 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bow.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bow.json @@ -18,7 +18,7 @@ " RS" ], "result": { - "item": "basemetals:zinc_bow" + "id": "basemetals:zinc_bow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bow_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_bow_recycling.json index 38ff24a60..db6ed9019 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bow_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_bow" }, "result": { - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_button.json b/src/generated/resources/data/basemetals/recipes/zinc_button.json index 1aa9cf2a2..dec26cf8e 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_button.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_button.json @@ -14,7 +14,7 @@ "X" ], "result": { - "item": "basemetals:zinc_button" + "id": "basemetals:zinc_button" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_button_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_button_recycling.json index 376f96609..2c7e0f9db 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_button_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_button_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json b/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json index e7332c328..74d7c97ad 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:zinc_chestplate" + "id": "basemetals:zinc_chestplate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_chestplate_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_chestplate_recycling.json index eed15cb4b..bd7870520 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_chestplate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_chestplate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 8, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json b/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json index 4b77f3eb2..c166e668d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:zinc_crackhammer" + "id": "basemetals:zinc_crackhammer" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_crackhammer_recycling.json index 0606b2be5..4d07895a5 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_crackhammer_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_crackhammer" }, "result": { - "item": "basemetals:zinc_block" + "id": "basemetals:zinc_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json b/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json index b5e40c4dd..f3d0b71dc 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json @@ -21,7 +21,7 @@ "R G" ], "result": { - "item": "basemetals:zinc_crossbow" + "id": "basemetals:zinc_crossbow" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crossbow_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_crossbow_recycling.json index 6b68e25f4..d5a58f8d4 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_crossbow_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_crossbow_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_door.json b/src/generated/resources/data/basemetals/recipes/zinc_door.json index b404d8814..5b20db48c 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_door.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_door.json @@ -16,7 +16,7 @@ ], "result": { "count": 3, - "item": "basemetals:zinc_door" + "id": "basemetals:zinc_door" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_door_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_door_recycling.json index 1567f1c1f..2ef2f4da2 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_door_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_door_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json b/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json index 856748cda..0ff4cc8b1 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json @@ -18,7 +18,7 @@ "R S" ], "result": { - "item": "basemetals:zinc_fishing_rod" + "id": "basemetals:zinc_fishing_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_gear.json b/src/generated/resources/data/basemetals/recipes/zinc_gear.json index 403cbdd9e..404265368 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_gear.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_gear.json @@ -19,7 +19,7 @@ ], "result": { "count": 4, - "item": "basemetals:zinc_gear" + "id": "basemetals:zinc_gear" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_gear_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_gear_recycling.json index fc93365bb..c1a21b1d6 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_gear_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_gear_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_gear" }, "result": { - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_helmet.json b/src/generated/resources/data/basemetals/recipes/zinc_helmet.json index 758feacf1..214b33257 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_helmet.json @@ -14,7 +14,7 @@ "X X" ], "result": { - "item": "basemetals:zinc_helmet" + "id": "basemetals:zinc_helmet" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_helmet_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_helmet_recycling.json index eeea88949..996d432cd 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_helmet_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_helmet_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 5, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_hoe.json b/src/generated/resources/data/basemetals/recipes/zinc_hoe.json index 9618027fd..ec0197424 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_hoe.json @@ -18,7 +18,7 @@ " S" ], "result": { - "item": "basemetals:zinc_hoe" + "id": "basemetals:zinc_hoe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_hoe_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_hoe_recycling.json index c08467404..74c40a745 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_hoe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_hoe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json b/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json index 44931ed69..97cc87acd 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json @@ -18,7 +18,7 @@ "XXX" ], "result": { - "item": "basemetals:zinc_horse_armor" + "id": "basemetals:zinc_horse_armor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ingot_crushing.json b/src/generated/resources/data/basemetals/recipes/zinc_ingot_crushing.json index 6a78f5612..4c5d4bdaa 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_ingot_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_ingot_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:ingots/zinc" }, "result": { - "item": "basemetals:zinc_powder" + "id": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json index b7ddbac23..72343d078 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_leggings.json b/src/generated/resources/data/basemetals/recipes/zinc_leggings.json index 15c4a77ac..1d74afe38 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_leggings.json @@ -15,7 +15,7 @@ "X X" ], "result": { - "item": "basemetals:zinc_leggings" + "id": "basemetals:zinc_leggings" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_leggings_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_leggings_recycling.json index c33550440..d4d5c3e04 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_leggings_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_leggings_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 7, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_lever.json b/src/generated/resources/data/basemetals/recipes/zinc_lever.json index 4e24860fa..8a6c3e355 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_lever.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_lever.json @@ -17,7 +17,7 @@ "X" ], "result": { - "item": "basemetals:zinc_lever" + "id": "basemetals:zinc_lever" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_lever_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_lever_recycling.json index 19d971044..cbb63ee94 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_lever_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_lever_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_lever" }, "result": { - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_nugget_crushing.json b/src/generated/resources/data/basemetals/recipes/zinc_nugget_crushing.json index 8e7953bc6..930e3174a 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_nugget_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_nugget_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:nuggets/zinc" }, "result": { - "item": "basemetals:zinc_smallpowder" + "id": "basemetals:zinc_smallpowder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json b/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json index 0bcfeb78e..9629fc7b6 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ore_blasting.json b/src/generated/resources/data/basemetals/recipes/zinc_ore_blasting.json index 3fea2e36b..477c28221 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_ore_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_ore_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/zinc" }, - "result": "basemetals:zinc_ingot" + "result": { + "id": "basemetals:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ore_crushing.json b/src/generated/resources/data/basemetals/recipes/zinc_ore_crushing.json index be245ad98..9202e7337 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_ore_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_ore_crushing.json @@ -5,6 +5,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_powder" + "id": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ore_smelting.json b/src/generated/resources/data/basemetals/recipes/zinc_ore_smelting.json index 522960d68..494507e40 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_ore_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_ore_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:ores/zinc" }, - "result": "basemetals:zinc_ingot" + "result": { + "id": "basemetals:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json b/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json index f4d523ba8..3d900f2ee 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:zinc_pickaxe" + "id": "basemetals:zinc_pickaxe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_pickaxe_recycling.json index 51baa0dd6..05f5606ae 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_pickaxe_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 3, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_plate.json b/src/generated/resources/data/basemetals/recipes/zinc_plate.json index 0a9be56c7..1b7e5eec2 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_plate.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_plate.json @@ -14,7 +14,7 @@ ], "result": { "count": 3, - "item": "basemetals:zinc_plate" + "id": "basemetals:zinc_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_plate_recycling.json index d6412aff1..3c458e4ad 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_plate_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_plate" }, "result": { - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json index 3b0759361..5f5594bd7 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json @@ -15,7 +15,7 @@ "XXX" ], "result": { - "item": "basemetals:zinc_powder" + "id": "basemetals:zinc_powder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_powder_smelting.json b/src/generated/resources/data/basemetals/recipes/zinc_powder_smelting.json index a3de3b379..85cb6c3bb 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_powder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_powder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:dusts/zinc" }, - "result": "basemetals:zinc_ingot" + "result": { + "id": "basemetals:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json index d0b2b463e..a8a56cdd4 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json @@ -13,7 +13,7 @@ "XX" ], "result": { - "item": "basemetals:zinc_pressure_plate" + "id": "basemetals:zinc_pressure_plate" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate_recycling.json index f12b5d563..ca055ab88 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_raw_blasting.json b/src/generated/resources/data/basemetals/recipes/zinc_raw_blasting.json index 75844d5d2..0d59f5f64 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_raw_blasting.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_raw_blasting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/zinc" }, - "result": "basemetals:zinc_ingot" + "result": { + "id": "basemetals:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_raw_crushing.json b/src/generated/resources/data/basemetals/recipes/zinc_raw_crushing.json index 66e9cbc92..f1b1b8cfc 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_raw_crushing.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_raw_crushing.json @@ -4,6 +4,6 @@ "tag": "forge:raw_materials/zinc" }, "result": { - "item": "basemetals:zinc_powder" + "id": "basemetals:zinc_powder" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_raw_smelting.json b/src/generated/resources/data/basemetals/recipes/zinc_raw_smelting.json index 04142843e..1799ecc3d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_raw_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_raw_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:raw_materials/zinc" }, - "result": "basemetals:zinc_ingot" + "result": { + "id": "basemetals:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_rod.json b/src/generated/resources/data/basemetals/recipes/zinc_rod.json index 481634ec9..f53f99d1a 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_rod.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_rod.json @@ -15,7 +15,7 @@ ], "result": { "count": 4, - "item": "basemetals:zinc_rod" + "id": "basemetals:zinc_rod" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_rod_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_rod_recycling.json index 876151d2f..521da2d7a 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_rod_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_rod_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_scythe.json b/src/generated/resources/data/basemetals/recipes/zinc_scythe.json index 4de312a47..30abb1b32 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_scythe.json @@ -18,7 +18,7 @@ " S " ], "result": { - "item": "basemetals:zinc_scythe" + "id": "basemetals:zinc_scythe" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shears.json b/src/generated/resources/data/basemetals/recipes/zinc_shears.json index 6e3d9dd7b..d79a52dd3 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shears.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shears.json @@ -14,7 +14,7 @@ "X " ], "result": { - "item": "basemetals:zinc_shears" + "id": "basemetals:zinc_shears" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shears_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_shears_recycling.json index c568104d2..22d4546b6 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shears_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shears_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shield.json b/src/generated/resources/data/basemetals/recipes/zinc_shield.json index ea942ee13..35349c2d8 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shield.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shield.json @@ -18,7 +18,7 @@ " X " ], "result": { - "item": "basemetals:zinc_shield" + "id": "basemetals:zinc_shield" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shovel.json b/src/generated/resources/data/basemetals/recipes/zinc_shovel.json index 6c5e5c839..f24b33058 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shovel.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:zinc_shovel" + "id": "basemetals:zinc_shovel" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shovel_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_shovel_recycling.json index ce09a68ce..444071d89 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shovel_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shovel_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_shovel" }, "result": { - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_slab.json b/src/generated/resources/data/basemetals/recipes/zinc_slab.json index 49a9f2fcc..507df2d4e 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_slab.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_slab.json @@ -14,7 +14,7 @@ ], "result": { "count": 6, - "item": "basemetals:zinc_slab" + "id": "basemetals:zinc_slab" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_slab_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_slab_recycling.json index 6e744ae66..729fa445f 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_slab_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_slab_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:zinc_nugget" + "id": "basemetals:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json b/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json index b1f113d02..36560d784 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json @@ -11,7 +11,7 @@ ], "result": { "count": 9, - "item": "basemetals:zinc_smallpowder" + "id": "basemetals:zinc_smallpowder" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/zinc_smallpowder_smelting.json index d6067cb43..62f056a5d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_smallpowder_smelting.json @@ -5,5 +5,7 @@ "ingredient": { "tag": "forge:tiny_dusts/zinc" }, - "result": "basemetals:zinc_nugget" + "result": { + "id": "basemetals:zinc_nugget" + } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_stairs.json b/src/generated/resources/data/basemetals/recipes/zinc_stairs.json index d0d3f3c5d..9430cfd2f 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_stairs.json @@ -16,7 +16,7 @@ ], "result": { "count": 4, - "item": "basemetals:zinc_stairs" + "id": "basemetals:zinc_stairs" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_sword.json b/src/generated/resources/data/basemetals/recipes/zinc_sword.json index d3628ca03..5d3297637 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_sword.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_sword.json @@ -18,7 +18,7 @@ "S" ], "result": { - "item": "basemetals:zinc_sword" + "id": "basemetals:zinc_sword" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_sword_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_sword_recycling.json index 32ad885ac..690fa3a41 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_sword_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_sword_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 2, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json b/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json index 0133d49c3..548a7d947 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json @@ -14,7 +14,7 @@ "XX" ], "result": { - "item": "basemetals:zinc_trapdoor" + "id": "basemetals:zinc_trapdoor" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_trapdoor_recycling.json index 63aec2c57..0fb97055f 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_trapdoor_recycling.json @@ -7,6 +7,6 @@ }, "result": { "count": 4, - "item": "basemetals:zinc_ingot" + "id": "basemetals:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_wall.json b/src/generated/resources/data/basemetals/recipes/zinc_wall.json index d06cc46df..0978a3e23 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_wall.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_wall.json @@ -15,7 +15,7 @@ ], "result": { "count": 6, - "item": "basemetals:zinc_wall" + "id": "basemetals:zinc_wall" } } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/recipes/zinc_wall_recycling.json b/src/generated/resources/data/basemetals/recipes/zinc_wall_recycling.json index 9da1f4126..52edb8210 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_wall_recycling.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_wall_recycling.json @@ -6,6 +6,6 @@ "item": "basemetals:zinc_wall" }, "result": { - "item": "basemetals:zinc_block" + "id": "basemetals:zinc_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/basemetals/registry_manifest.json b/src/generated/resources/data/basemetals/registry_manifest.json index 11b620935..e9ee04000 100644 --- a/src/generated/resources/data/basemetals/registry_manifest.json +++ b/src/generated/resources/data/basemetals/registry_manifest.json @@ -1735,5 +1735,5 @@ "basemetals:wood", "basemetals:stone" ], - "source": "Base Metals 1.20.1 catalogue" + "source": "Base Metals 1.20.6 catalogue" } \ No newline at end of file diff --git a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java index 093bf61e5..eba1178b6 100644 --- a/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java +++ b/src/integratedSmoke/java/zone/moddev/mc/basemetals/smoke/IntegratedWorldSmoke.java @@ -36,7 +36,7 @@ /** * Development-only proof that the real client can create, join, tick, and - * cleanly stop an integrated 1.18.2 server with Base Metals and OreSpawn. + * cleanly stop an integrated server with Base Metals and OreSpawn. */ @Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, value = Dist.CLIENT) public final class IntegratedWorldSmoke { @@ -109,7 +109,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) { BaseMetals.LOGGER.info("BASEMETALS_INTEGRATED_SMOKE creating world={}", worldName); minecraft.createWorldOpenFlows().createFreshLevel(worldName, levelSettings, new net.minecraft.world.level.levelgen.WorldOptions(0L, true, false), - net.minecraft.world.level.levelgen.presets.WorldPresets::createNormalWorldDimensions); + net.minecraft.world.level.levelgen.presets.WorldPresets::createNormalWorldDimensions, minecraft.screen); } if (creationStarted && minecraft.screen instanceof net.minecraft.client.gui.screens.ConfirmScreen) { @@ -322,7 +322,7 @@ private static void verifyCreativeBuckets(Minecraft minecraft) { NonNullList searchTab = NonNullList.create(); net.minecraft.world.item.CreativeModeTabs.tryRebuildTabContents( net.minecraft.world.flag.FeatureFlags.VANILLA_SET, true, - RegistryAccess.fromRegistryOfRegistries(net.minecraft.core.registries.BuiltInRegistries.REGISTRY)); + minecraft.level.registryAccess()); itemsTab.addAll(ModTabs.ITEMS.get().getDisplayItems()); searchTab.addAll(net.minecraft.world.item.CreativeModeTabs.searchTab().getDisplayItems()); var shown = new java.util.HashSet(); diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java index 20427d5ba..3fd05162b 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java @@ -8,7 +8,6 @@ import zone.moddev.mc.basemetals.recipe.CrushingRecipe; import zone.moddev.mc.basemetals.entity.ModEntities; import zone.moddev.mc.basemetals.loot.ModLoot; -import zone.moddev.mc.basemetals.compat.MekanismCompat; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; @@ -23,28 +22,22 @@ public final class BaseMetals { public static final String MOD_ID = "basemetals"; public static final Logger LOGGER = LogManager.getLogger(MOD_ID); - public BaseMetals() { - IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); + public BaseMetals(FMLJavaModLoadingContext context) { + IEventBus modBus = context.getModEventBus(); 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) -> { event.enqueueWork(() -> { zone.moddev.mc.basemetals.network.ContentModeNetwork.register(); - net.minecraftforge.common.crafting.CraftingHelper.register( - new zone.moddev.mc.basemetals.recipe.ContentRecipeCondition.Serializer()); }); }); CrushingRecipe.TYPES.register(modBus); CrushingRecipe.SERIALIZERS.register(modBus); ModEntities.register(modBus); ModLoot.register(modBus); - if (ModList.get().isLoaded("mekanism")) MekanismCompat.register(modBus); - if (ModList.get().isLoaded("tconstruct")) { - MinecraftForge.EVENT_BUS.addListener(net.minecraftforge.eventbus.api.EventPriority.LOWEST, - zone.moddev.mc.basemetals.compat.TinkersCompat::addReloadListener); - } - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BaseMetalsConfig.SPEC); + context.registerConfig(ModConfig.Type.COMMON, BaseMetalsConfig.SPEC); MinecraftForge.EVENT_BUS.register(new BaseMetalsEvents()); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java index 66f63a56d..1dae37588 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsAdvancements.java @@ -6,7 +6,7 @@ import zone.moddev.mc.basemetals.content.MaterialBacked; import zone.moddev.mc.basemetals.content.MaterialItems; -import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -27,7 +27,7 @@ final class BaseMetalsAdvancements { private static final String CRITERION = "event"; private static final TagKey STORAGE_BLOCKS = BlockTags.create( - new ResourceLocation("forge", "storage_blocks")); + ResourceLocation.fromNamespaceAndPath("forge", "storage_blocks")); private static final Map ALLOY_ADVANCEMENTS = Map.ofEntries( Map.entry("aquarium", "aquarium_maker"), Map.entry("brass", "brass_maker"), @@ -107,8 +107,8 @@ private static boolean material(ItemStack stack, String expected) { } static boolean award(ServerPlayer player, String id) { - Advancement advancement = player.getServer().getAdvancements().getAdvancement( - new ResourceLocation(BaseMetals.MOD_ID, id)); + AdvancementHolder advancement = player.getServer().getAdvancements().get( + ResourceLocation.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 522bd08c8..7836e9eca 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -22,7 +22,6 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.MobType; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ArmorItem; @@ -54,13 +53,13 @@ public final class BaseMetalsEvents { public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { if (!(event.getEntity() instanceof ServerPlayer player)) return; - var recipes = new ArrayList>(); + var recipes = new ArrayList>(); for (var recipe : player.server.getRecipeManager().getRecipes()) { - if (!recipe.getId().getNamespace().equals(BaseMetals.MOD_ID) || recipe.isSpecial()) continue; + if (!recipe.id().getNamespace().equals(BaseMetals.MOD_ID) || recipe.value().isSpecial()) continue; - var unlock = player.server.getAdvancements().getAdvancement(new ResourceLocation( - BaseMetals.MOD_ID, "recipes/" + recipe.getId().getPath())); + var unlock = player.server.getAdvancements().get(ResourceLocation.fromNamespaceAndPath( + BaseMetals.MOD_ID, "recipes/" + recipe.id().getPath())); if (unlock != null && player.getAdvancements().getOrStartProgress(unlock).isDone()) recipes.add(recipe); } @@ -87,7 +86,7 @@ public void onBreak(BlockEvent.BreakEvent event) { 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.getRecipeManager().getRecipeFor(CrushingRecipe.TYPE.get(), new SimpleContainer(new ItemStack(event.getState().getBlock())), level); if (recipe.isPresent()) { event.setCanceled(true); @@ -96,14 +95,14 @@ public void onBreak(BlockEvent.BreakEvent event) { true, level.getFluidState(event.getPos())); if (!removed) return; event.getState().getBlock().destroy(level, event.getPos(), event.getState()); - ItemStack result = recipe.get().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).copy(); + ItemStack result = recipe.get().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).copy(); ItemEntity entity = new ItemEntity(level, event.getPos().getX() + 0.5D, event.getPos().getY() + 0.5D, event.getPos().getZ() + 0.5D, result); entity.setDefaultPickUpDelay(); level.addFreshEntity(entity); player.awardStat(net.minecraft.stats.Stats.BLOCK_MINED.get(event.getState().getBlock())); player.causeFoodExhaustion(0.005F); - held.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(InteractionHand.MAIN_HAND)); + held.hurtAndBreak(1, player, EquipmentSlot.MAINHAND); return; } } @@ -163,7 +162,7 @@ private static void applyArmorEffects(Player player, Map } if (count(armor, "mithril") == 4) { for (MobEffectInstance effect : new ArrayList<>(player.getActiveEffects())) { - if (effect.getEffect().getCategory() == MobEffectCategory.HARMFUL) { + if (effect.getEffect().value().getCategory() == MobEffectCategory.HARMFUL) { player.removeEffect(effect.getEffect()); } } @@ -173,7 +172,7 @@ private static void applyArmorEffects(Player player, Map if (starsteel >= 2) add(player, MobEffects.MOVEMENT_SPEED, Math.min(2, starsteel - 2)); } - private static void add(Player player, net.minecraft.world.effect.MobEffect effect, int amplifier) { + private static void add(Player player, net.minecraft.core.Holder effect, int amplifier) { player.addEffect(new MobEffectInstance(effect, 45, amplifier, false, false, true)); } @@ -195,7 +194,7 @@ public void onLivingHurt(LivingHurtEvent event) { if (target.fireImmune()) event.setAmount(event.getAmount() + 3.0F); } case "mithril" -> { - if (target.getMobType() == MobType.UNDEAD) { + if (target.getType().is(net.minecraft.tags.EntityTypeTags.UNDEAD)) { target.addEffect(new MobEffectInstance(MobEffects.WITHER, 60, 3)); target.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 60, 1)); } @@ -212,15 +211,17 @@ public void onShieldUpgrade(AnvilUpdateEvent event) { MaterialDefinition upgrade = shieldMaterials().values().stream() .filter(candidate -> candidate.hardness() > current.hardness()) .filter(candidate -> event.getRight().is(ItemTags.create( - new ResourceLocation("forge", "plates/" + candidate.name())))) + ResourceLocation.fromNamespaceAndPath("forge", "plates/" + candidate.name())))) .sorted(Comparator.comparingDouble(MaterialDefinition::hardness) .thenComparing(MaterialDefinition::name)) .findFirst().orElse(null); if (upgrade == null) return; if (!zone.moddev.mc.basemetals.config.ContentPolicy.active().allows("basemetals:" + upgrade.name() + "_shield")) return; ItemStack output = ModContent.item(upgrade.name() + "_shield").get().getDefaultInstance(); - EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(event.getLeft()), output); - int enchantments = EnchantmentHelper.getEnchantments(event.getLeft()).size(); + output.applyComponents(event.getLeft().getComponentsPatch()); + output.setDamageValue(0); + int enchantments = event.getLeft().getOrDefault(net.minecraft.core.component.DataComponents.ENCHANTMENTS, + net.minecraft.world.item.enchantment.ItemEnchantments.EMPTY).size(); int cost = shieldUpgradeCost(current, upgrade, enchantments); event.setOutput(output); event.setCost(cost); diff --git a/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java b/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java index 8b90000e3..04d5a4943 100644 --- a/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java +++ b/src/main/java/zone/moddev/mc/basemetals/MissingMappings.java @@ -66,11 +66,11 @@ public static ResourceLocation vanilla114Target(ResourceLocation oldName) { // 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 new ResourceLocation("minecraft", "oak_sign"); - case "wall_sign": return new ResourceLocation("minecraft", "oak_wall_sign"); - case "rose_red": return new ResourceLocation("minecraft", "red_dye"); - case "cactus_green": return new ResourceLocation("minecraft", "green_dye"); - case "dandelion_yellow": return new ResourceLocation("minecraft", "yellow_dye"); + 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"); default: return null; } } @@ -87,8 +87,8 @@ public static String itemTargetPath(String path) { public static ResourceLocation itemTargetId(String path) { return "iron_nugget".equals(path) - ? new ResourceLocation("minecraft", "iron_nugget") - : new ResourceLocation(BaseMetals.MOD_ID, itemTargetPath(path)); + ? ResourceLocation.fromNamespaceAndPath("minecraft", "iron_nugget") + : ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, itemTargetPath(path)); } public static String fluidTargetPath(String name) { diff --git a/src/main/java/zone/moddev/mc/basemetals/ModTags.java b/src/main/java/zone/moddev/mc/basemetals/ModTags.java index 0616b17b1..570f62abc 100644 --- a/src/main/java/zone/moddev/mc/basemetals/ModTags.java +++ b/src/main/java/zone/moddev/mc/basemetals/ModTags.java @@ -8,9 +8,9 @@ public final class ModTags { public static final TagKey SCYTHE_HARVESTABLE = BlockTags.create( - new ResourceLocation(BaseMetals.MOD_ID, "scythe_harvestable")); + ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, "scythe_harvestable")); public static final TagKey CRACKHAMMER_CRUSHABLE = BlockTags.create( - new ResourceLocation(BaseMetals.MOD_ID, "crackhammer_crushable")); + ResourceLocation.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 5d8dd941f..eaf155c15 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java @@ -120,9 +120,9 @@ public void onClose() { @Override public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { - renderBackground(graphics); - graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFF); + renderBackground(graphics, mouseX, mouseY, partialTicks); super.render(graphics, mouseX, mouseY, partialTicks); + graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFF); for (net.minecraft.client.gui.components.events.GuiEventListener child : children()) { if (child instanceof OptionButton && ((OptionButton) child).isHoveredOrFocused()) { 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 bab884081..000240546 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/ClientSetup.java @@ -54,18 +54,18 @@ public static void clientSetup(FMLClientSetupEvent event) { 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, new ResourceLocation("pull"), (stack, level, user, seed) -> + ItemProperties.register(item, ResourceLocation.parse("pull"), (stack, level, user, seed) -> user == null || user.getUseItem() != stack ? 0.0F : (float) (stack.getUseDuration() - user.getUseItemRemainingTicks()) / 20.0F); - ItemProperties.register(item, new ResourceLocation("pulling"), (stack, level, user, seed) -> + 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, new ResourceLocation("blocking"), (stack, level, user, seed) -> + 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, new ResourceLocation("cast"), (stack, level, user, seed) -> { + 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; 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 34ff72083..3284fb223 100644 --- a/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java +++ b/src/main/java/zone/moddev/mc/basemetals/client/MaterialProjectileRenderer.java @@ -35,7 +35,7 @@ public void render(MaterialProjectile projectile, float yaw, float partialTicks, } @Override - public void vertex(Matrix4f pose, Matrix3f normal, VertexConsumer vertices, + public void vertex(PoseStack.Pose pose, VertexConsumer vertices, int x, int y, int z, float u, float v, int normalX, int normalY, int normalZ, int packedLight) { vertices.vertex(pose, x, y, z) @@ -43,7 +43,7 @@ public void vertex(Matrix4f pose, Matrix3f normal, VertexConsumer vertices, .uv(u, v) .overlayCoords(OverlayTexture.NO_OVERLAY) .uv2(packedLight) - .normal(normal, normalX, normalZ, normalY) + .normal(pose, normalX, normalZ, normalY) .endVertex(); } diff --git a/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java b/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java deleted file mode 100644 index b0fb23c9c..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/compat/MekanismCompat.java +++ /dev/null @@ -1,45 +0,0 @@ -package zone.moddev.mc.basemetals.compat; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import zone.moddev.mc.basemetals.BaseMetals; -import zone.moddev.mc.basemetals.material.MaterialCatalogue; - -import mekanism.api.MekanismAPI; -import mekanism.api.chemical.slurry.Slurry; -import mekanism.api.chemical.slurry.SlurryBuilder; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; - -/** The only code-backed optional integration: Mekanism slurries are registry entries, not data-pack entries. */ -public final class MekanismCompat { - public static final List PROCESSING_MATERIALS = List.of( - "adamantine", "antimony", "bismuth", "coldiron", - "nickel", "platinum", "starsteel", "zinc"); - - private static final DeferredRegister SLURRIES = DeferredRegister.create( - MekanismAPI.SLURRY_REGISTRY_NAME, BaseMetals.MOD_ID); - private static final Map> DIRTY = new LinkedHashMap<>(); - private static final Map> CLEAN = new LinkedHashMap<>(); - - static { - for (String name : PROCESSING_MATERIALS) { - int colour = MaterialCatalogue.get(name).colour(); - ResourceLocation oreTag = new ResourceLocation("forge", "ores/" + name); - DIRTY.put(name, SLURRIES.register("dirty_" + name, - () -> new Slurry(SlurryBuilder.dirty().tint(colour).ore(oreTag)))); - CLEAN.put(name, SLURRIES.register("clean_" + name, - () -> new Slurry(SlurryBuilder.clean().tint(colour).ore(oreTag)))); - } - } - - private MekanismCompat() {} - - public static void register(IEventBus modBus) { - SLURRIES.register(modBus); - } -} diff --git a/src/main/java/zone/moddev/mc/basemetals/compat/TinkersCompat.java b/src/main/java/zone/moddev/mc/basemetals/compat/TinkersCompat.java deleted file mode 100644 index e4e563ca6..000000000 --- a/src/main/java/zone/moddev/mc/basemetals/compat/TinkersCompat.java +++ /dev/null @@ -1,57 +0,0 @@ -package zone.moddev.mc.basemetals.compat; - -import java.io.IOException; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraft.server.packs.resources.ResourceManagerReloadListener; -import net.minecraftforge.event.AddReloadListenerEvent; -import slimeknights.tconstruct.library.materials.MaterialRegistry; -import slimeknights.tconstruct.library.materials.definition.MaterialId; -import slimeknights.tconstruct.library.materials.stats.IMaterialStats; -import slimeknights.tconstruct.library.materials.stats.UpdateMaterialStatsPacket; -import zone.moddev.mc.basemetals.BaseMetals; -import zone.moddev.mc.basemetals.config.BaseMetalsConfig; -import zone.moddev.mc.basemetals.config.ContentMode; - -/** Filters bundled material stats after Tinkers loads them and before login sync. */ -public final class TinkersCompat { - private TinkersCompat() {} - - public static void addReloadListener(AddReloadListenerEvent event) { - event.addListener((ResourceManagerReloadListener) TinkersCompat::filterBundledStats); - } - - private static void filterBundledStats(ResourceManager resources) { - ContentMode mode = BaseMetalsConfig.activeMode(); - if (mode == ContentMode.HIGH_FANTASY) return; - - var registry = MaterialRegistry.getInstance(); - Map> filtered = new LinkedHashMap<>(); - for (var material : registry.getAllMaterials()) { - MaterialId id = material.getIdentifier(); - Collection stats = registry.getAllStats(id); - if (BaseMetals.MOD_ID.equals(id.getNamespace()) && !hasExplicitOverride(resources, id)) { - stats = stats.stream().filter(stat -> TinkersContentPolicy.allows(mode, - id.getPath(), stat.getIdentifier().toString())).toList(); - } - filtered.put(id, stats); - } - - // This public entry point updates the same snapshot Tinkers sends to clients. - MaterialRegistry.updateMaterialStatsFromServer(new UpdateMaterialStatsPacket(filtered)); - } - - private static boolean hasExplicitOverride(ResourceManager resources, MaterialId material) { - ResourceLocation file = new ResourceLocation(material.getNamespace(), - "tinkering/materials/stats/" + material.getPath() + ".json"); - String bundledPack = net.minecraftforge.resource.ResourcePackLoader.getPackFor(BaseMetals.MOD_ID) - .orElseThrow(() -> new IllegalStateException("Base Metals' data pack is missing")) - .packId(); - return resources.getResourceStack(file).stream() - .anyMatch(resource -> !bundledPack.equals(resource.sourcePackId())); - } -} 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 1af5fe4ad..f3e22327a 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/BaseMetalBucketItem.java @@ -4,7 +4,6 @@ import javax.annotation.Nullable; -import zone.moddev.mc.basemetals.ModTabs; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; @@ -23,7 +22,6 @@ import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; -import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; @@ -88,17 +86,11 @@ private boolean emptyContents(@Nullable net.minecraft.world.entity.player.Player ItemStack bucket = container == null ? getDefaultInstance() : container; FluidStack contents = new FluidStack(getFluid(), net.minecraftforge.fluids.FluidType.BUCKET_VOLUME); return FluidUtil.tryPlaceFluid(player, level, hand, - position, bucket, contents).isSuccess(); - } - - @Override - public ICapabilityProvider initCapabilities(ItemStack stack, - @Nullable net.minecraft.nbt.CompoundTag nbt) { - return new FluidBucketWrapper(stack); + position, new FluidBucketWrapper(bucket.copyWithCount(1)), contents); } private boolean canContainFluid(Level level, BlockPos position, BlockState state) { return state.getBlock() instanceof LiquidBlockContainer container - && container.canPlaceLiquid(level, position, state, getFluid()); + && container.canPlaceLiquid(null, level, position, state, getFluid()); } } 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 5375ba79e..9c5023694 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/CrackhammerItem.java @@ -26,9 +26,10 @@ public final class CrackhammerItem extends DiggerItem implements MaterialBacked private final MaterialDefinition material; public CrackhammerItem(MaterialDefinition material, Properties properties) { - super(5.0F + material.baseAttackDamage(), -3.5F, new MaterialTier(material), - BlockTags.MINEABLE_WITH_PICKAXE, - properties.durability(material.crackhammerDurability())); + super(new MaterialTier(material), BlockTags.MINEABLE_WITH_PICKAXE, + properties.durability(material.crackhammerDurability()).attributes( + DiggerItem.createAttributes(new MaterialTier(material), + 5.0F + material.baseAttackDamage(), -3.5F))); this.material = material; } @@ -48,7 +49,7 @@ public boolean canPerformAction(ItemStack stack, ToolAction action) { } @Override - public void appendHoverText(ItemStack stack, @javax.annotation.Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, net.minecraft.world.item.TooltipFlag flag) { MaterialItems.addToolTooltip(material, tooltip); @@ -65,7 +66,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 = context.getLevel().getRecipeManager().getRecipeFor( CrushingRecipe.TYPE.get(), new SimpleContainer(input), context.getLevel()); if (recipe.isEmpty() || !canCrushDroppedBlock(context.getItemInHand(), input)) continue; // Sneaking is the per-use full-stack control; ordinary use crushes @@ -77,12 +78,12 @@ public InteractionResult useOn(UseOnContext context) { : requested; int operations = Math.min(requested, durability); if (operations == 0) break; - ItemStack output = recipe.get().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).copy(); + ItemStack output = recipe.get().value().getResultItem(net.minecraft.core.RegistryAccess.EMPTY).copy(); input.shrink(operations); if (input.isEmpty()) entity.discard(); else entity.setItem(input); spawnOutputs(context.getLevel(), entity, output, operations); hammer.hurtAndBreak(operations, context.getPlayer(), - player -> player.broadcastBreakEvent(context.getHand())); + net.minecraft.world.entity.LivingEntity.getSlotForHand(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/HumanDetectorBlock.java b/src/main/java/zone/moddev/mc/basemetals/content/HumanDetectorBlock.java index 90f3e717c..ad5bc895d 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/HumanDetectorBlock.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/HumanDetectorBlock.java @@ -11,7 +11,7 @@ public final class HumanDetectorBlock extends PressurePlateBlock { public HumanDetectorBlock(Properties properties) { - super(Sensitivity.EVERYTHING, properties, net.minecraft.world.level.block.state.properties.BlockSetType.STONE); + super(net.minecraft.world.level.block.state.properties.BlockSetType.STONE, properties); } @Override 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 28742bece..81e48bf0a 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialArmor.java @@ -1,37 +1,54 @@ package zone.moddev.mc.basemetals.content; -import java.util.function.Supplier; - -import zone.moddev.mc.basemetals.material.MaterialDefinition; +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.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.EquipmentSlot; +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 zone.moddev.mc.basemetals.BaseMetals; +import zone.moddev.mc.basemetals.material.MaterialDefinition; -public final class MaterialArmor implements ArmorMaterial { - private static final int[] DURABILITY = {13, 15, 16, 11}; - private final MaterialDefinition material; - private final Supplier repair; +/** Registered armour materials shared by worn armour and horse armour. */ +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<>(); - public MaterialArmor(MaterialDefinition material) { - this.material = material; - this.repair = () -> Ingredient.of(ItemTags.create( - new ResourceLocation(material.repairIngredientTag()))); + private MaterialArmor() {} + + public static void register(MaterialDefinition material) { + BY_NAME.computeIfAbsent(material.name(), name -> MATERIALS.register(name, () -> create(material))); } - public MaterialDefinition material() { return material; } - @Override public int getDurabilityForType(net.minecraft.world.item.ArmorItem.Type type) { - return DURABILITY[type.getSlot().getIndex()] * material.armorDurabilityFactor(); + public static void register(IEventBus bus) { + MATERIALS.register(bus); + } + + public static Holder get(MaterialDefinition material) { + return BY_NAME.get(material.name()).getHolder().orElseThrow(); + } + + 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 + ? 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); } - @Override public int getDefenseForType(net.minecraft.world.item.ArmorItem.Type type) { return material.armorProtection(type.getSlot()); } - @Override public int getEnchantmentValue() { return material.enchantability(); } - @Override public SoundEvent getEquipSound() { return SoundEvents.ARMOR_EQUIP_IRON; } - @Override public Ingredient getRepairIngredient() { return repair.get(); } - @Override public String getName() { return "basemetals:" + material.name(); } - @Override public float getToughness() { return material.armorToughness(); } - @Override public float getKnockbackResistance() { return 0.0F; } } 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 8aa064715..674c8fda0 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialBacked.java @@ -10,7 +10,7 @@ public interface MaterialBacked { MaterialDefinition baseMetalsMaterial(); default boolean isMaterialRepairIngredient(ItemStack repair) { - return repair.is(ItemTags.create(new ResourceLocation( + return repair.is(ItemTags.create(ResourceLocation.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 011d2f786..5e1e6dc20 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialItems.java @@ -23,7 +23,9 @@ import net.minecraft.world.item.BowItem; import net.minecraft.world.item.FishingRodItem; import net.minecraft.world.item.HoeItem; -import net.minecraft.world.item.HorseArmorItem; +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; @@ -62,93 +64,96 @@ public Basic(MaterialDefinition material, int burnTime, Properties properties) { public static final class Pickaxe extends PickaxeItem implements MaterialBacked { private final MaterialDefinition material; public Pickaxe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), 1, -2.8F, properties); this.material = material; + super(new MaterialTier(material), properties.attributes( + toolAttributes(material, 1, -2.8F))); + this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, + @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List 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), 4.0F + material.baseAttackDamage(), - material.axeAttackSpeed(), properties); + super(new MaterialTier(material), properties.attributes( + toolAttributes(material, 4.0F + material.baseAttackDamage(), material.axeAttackSpeed()))); this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, + @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List 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), 1.5F, -3.0F, properties); this.material = material; + super(new MaterialTier(material), properties.attributes(toolAttributes(material, 1.5F, -3.0F))); + this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, + @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static final class Hoe extends HoeItem implements MaterialBacked { private final MaterialDefinition material; - private final Multimap modifiers; public Hoe(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), 0, material.baseAttackDamage() - 3.0F, properties); - this.material = material; - this.modifiers = ImmutableMultimap.builder() - // ItemHoe in 1.12 contributed no attack-damage modifier; - // the player's normal one point of unarmed damage remains. - .put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, - "Tool modifier", 0.0D, AttributeModifier.Operation.ADDITION)) - .put(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_UUID, + super(new MaterialTier(material), properties.attributes(ItemAttributeModifiers.builder() + .add(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, + "Tool modifier", 0.0D, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) + .add(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_UUID, "Tool modifier", material.baseAttackDamage() - 3.0D, - AttributeModifier.Operation.ADDITION)) - .build(); + AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) + .build())); + this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public float getAttackDamage() { return 0.0F; } - @Override public Multimap getDefaultAttributeModifiers(EquipmentSlot slot) { - return slot == EquipmentSlot.MAINHAND ? modifiers : super.getDefaultAttributeModifiers(slot); - } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, + + @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static class Sword extends SwordItem implements MaterialBacked { private final MaterialDefinition material; public Sword(MaterialDefinition material, Properties properties) { - super(new MaterialTier(material), 3, -2.4F, properties); this.material = material; + super(new MaterialTier(material), properties.attributes( + SwordItem.createAttributes(new MaterialTier(material), 3, -2.4F))); + this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, + @Override public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } } public static final class Armor extends ArmorItem implements MaterialBacked { private final MaterialDefinition material; public Armor(MaterialDefinition material, EquipmentSlot slot, Properties properties) { - super(new MaterialArmor(material), armorType(slot), properties); this.material = material; + super(MaterialArmor.get(material), armorType(slot), + properties.durability(armorType(slot).getDurability(material.armorDurabilityFactor()))); + this.material = material; } @Override public MaterialDefinition baseMetalsMaterial() { return material; } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addArmorTooltip(material, tooltip); } } - public static final class HorseArmor extends HorseArmorItem implements MaterialBacked { + public static final class HorseArmor extends AnimalArmorItem implements MaterialBacked { private final MaterialDefinition material; public HorseArmor(MaterialDefinition material, Properties properties) { - super(material.horseArmorProtection(), new ResourceLocation(BaseMetals.MOD_ID, - "textures/entity/horse/armor/horse_armor_" + material.name() + ".png"), properties); + super(MaterialArmor.get(material), BodyType.EQUESTRIAN, false, properties.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) { return switch (slot) { case HEAD -> ArmorItem.Type.HELMET; @@ -179,7 +184,7 @@ public static final class Shears extends ShearsItem implements MaterialBacked { return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } @@ -193,7 +198,7 @@ public static class Shield extends ShieldItem implements MaterialBacked { return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } @@ -221,7 +226,7 @@ public static class Bow extends BowItem implements MaterialBacked { return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } @@ -242,7 +247,7 @@ public static final class Crossbow extends BowItem implements MaterialBacked { public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int timeLeft) { if (!(user instanceof Player player)) return; boolean hasInfiniteAmmo = player.getAbilities().instabuild - || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, bow) > 0; + || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY, bow) > 0; ItemStack ammunition = findBolt(player); int charge = getUseDuration(bow) - timeLeft; charge = net.minecraftforge.event.ForgeEventFactory.onArrowLoose( @@ -267,16 +272,16 @@ public void releaseUsing(ItemStack bow, Level level, LivingEntity user, int time bolt.shootFromRotation(player, player.getXRot(), player.getYRot(), 0.0F, power * 3.0F, 1.0F); if (power == 1.0F) bolt.setCritArrow(true); - int powerLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER_ARROWS, bow); + int powerLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER, bow); if (powerLevel > 0) { bolt.setBaseDamage(bolt.getBaseDamage() + powerLevel * 0.5D + 0.5D); } - int punchLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH_ARROWS, bow); + int punchLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH, bow); if (punchLevel > 0) bolt.setKnockback(punchLevel); - if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, bow) > 0) { - bolt.setSecondsOnFire(100); + if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAME, bow) > 0) { + bolt.igniteForSeconds(100); } - bow.hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(player.getUsedItemHand())); + bow.hurtAndBreak(1, player, LivingEntity.getSlotForHand(player.getUsedItemHand())); if (infiniteShot) bolt.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; level.addFreshEntity(bolt); } @@ -303,7 +308,7 @@ private ItemStack findBolt(Player player) { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } @@ -317,7 +322,7 @@ public static final class FishingRod extends FishingRodItem implements MaterialB return isMaterialRepairIngredient(repair) || super.isValidRepairItem(toRepair, repair); } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List tooltip, TooltipFlag flag) { addToolTooltip(material, tooltip); } 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 cd6de3842..791fc48b5 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/MaterialTier.java @@ -19,7 +19,7 @@ public final class MaterialTier implements Tier { public MaterialTier(MaterialDefinition material) { this.material = material; - TagKey tag = ItemTags.create(new ResourceLocation(material.repairIngredientTag())); + TagKey tag = ItemTags.create(ResourceLocation.parse(material.repairIngredientTag())); this.repair = () -> Ingredient.of(tag); } @@ -30,7 +30,15 @@ public MaterialDefinition 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 getLevel() { return material.toolLevel(); } + @Override + public net.minecraft.tags.TagKey getIncorrectBlocksForDrops() { + return switch (material.toolLevel()) { + case 0 -> net.minecraft.tags.BlockTags.INCORRECT_FOR_WOODEN_TOOL; + case 1 -> net.minecraft.tags.BlockTags.INCORRECT_FOR_STONE_TOOL; + case 2 -> net.minecraft.tags.BlockTags.INCORRECT_FOR_IRON_TOOL; + default -> net.minecraft.tags.BlockTags.INCORRECT_FOR_DIAMOND_TOOL; + }; + } @Override public int getEnchantmentValue() { return material.enchantability(); } @Override public Ingredient getRepairIngredient() { return repair.get(); } } 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 cc7eb01f0..e278e0cd4 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java @@ -68,6 +68,8 @@ public final class ModContent { "casing", "dense_plate", "crushed", "crushed_purified", "crystal", "shard", "clump", "powder_dirty"); static { + MaterialCatalogue.ALL.forEach(MaterialArmor::register); + vanillaDefinitions().values().forEach(MaterialArmor::register); MaterialCatalogue.ALL.forEach(ModContent::registerMaterial); registerAnvil("stone_anvil", BlockBehaviour.Properties.of().mapColor(MapColor.STONE) .sound(SoundType.STONE).strength(5.0F, 10.0F)); @@ -90,6 +92,7 @@ public final class ModContent { private ModContent() {} public static void register(IEventBus bus) { + MaterialArmor.register(bus); BLOCKS.register(bus); ITEMS.register(bus); FLUIDS.register(bus); @@ -179,14 +182,14 @@ private static RegistryObject registerMaterialBlock(String id, String for Supplier factory = switch (form) { case "plate" -> () -> new PlateBlock(properties.get().noOcclusion()); case "bars" -> () -> new IronBarsBlock(properties.get().noOcclusion().dynamicShape()); - case "door" -> () -> new DoorBlock(properties.get().noOcclusion().dynamicShape(), doorType(material)); - case "trapdoor" -> () -> new TrapDoorBlock(properties.get().noOcclusion().dynamicShape(), doorType(material)); - case "button" -> () -> new ButtonBlock(properties.get().noCollission(), BlockSetType.STONE, 20, false); + 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 "pressure_plate" -> () -> new PressurePlateBlock( - PressurePlateBlock.Sensitivity.MOBS, properties.get(), BlockSetType.STONE); - case "stairs" -> () -> new StairBlock(stairBase, properties.get()); + BlockSetType.STONE, properties.get()); + case "stairs" -> () -> new StairBlock(stairBase.get(), properties.get()); case "wall" -> () -> new WallBlock(properties.get()); default -> () -> new Block(properties.get()); }; @@ -270,8 +273,8 @@ 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.copy(net.minecraft.world.level.block.Blocks.GOLD_BLOCK).noOcclusion()), true); - registerBlock("iron_plate", () -> new PlateBlock(BlockBehaviour.Properties.copy(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).noOcclusion()), true); + registerBlock("iron_plate", () -> new PlateBlock(BlockBehaviour.Properties.ofFullCopy(net.minecraft.world.level.block.Blocks.IRON_BLOCK).noOcclusion()), true); for (String name : List.of("diamond", "emerald", "gold", "iron", "obsidian", "quartz")) { registerVanillaCombatAndUtility(vanilla.get(name)); @@ -412,9 +415,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 = new ResourceLocation(BaseMetals.MOD_ID, + ResourceLocation still = ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, mercury ? "block/mercury_still" : "block/molten_metal_still"); - ResourceLocation flow = new ResourceLocation(BaseMetals.MOD_ID, + ResourceLocation flow = ResourceLocation.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) 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 bf37e9f1f..b07f421a1 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/ScytheItem.java @@ -25,7 +25,8 @@ public final class ScytheItem extends DiggerItem implements MaterialBacked { private final MaterialDefinition material; public ScytheItem(MaterialDefinition material, Properties properties) { - super(0.0F, 0.0F, new MaterialTier(material), ModTags.SCYTHE_HARVESTABLE, properties); + super(new MaterialTier(material), ModTags.SCYTHE_HARVESTABLE, + properties.attributes(DiggerItem.createAttributes(new MaterialTier(material), 0.0F, 0.0F))); this.material = material; } @@ -60,7 +61,7 @@ public boolean onBlockStartBreak(ItemStack stack, BlockPos position, Player play } @Override - public void appendHoverText(ItemStack stack, @Nullable Level level, + public void appendHoverText(ItemStack stack, net.minecraft.world.item.Item.TooltipContext context, List 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 b49ec9fb4..3227be191 100644 --- a/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java +++ b/src/main/java/zone/moddev/mc/basemetals/entity/MaterialProjectile.java @@ -12,7 +12,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraftforge.entity.IEntityAdditionalSpawnData; -import net.minecraftforge.network.NetworkHooks; +import net.minecraftforge.common.ForgeHooks; public final class MaterialProjectile extends AbstractArrow implements IEntityAdditionalSpawnData, ItemSupplier { private ItemStack ammunition = ItemStack.EMPTY; @@ -28,11 +28,18 @@ public MaterialProjectile(EntityType type, Level l setPos(shooter.getX(), shooter.getEyeY() - 0.1D, shooter.getZ()); this.ammunition = ammunition.copy(); this.ammunition.setCount(1); + setPickupItemStack(this.ammunition); + } + + @Override + protected ItemStack getDefaultPickupItem() { + String form = getType() == zone.moddev.mc.basemetals.entity.ModEntities.CUSTOM_BOLT.get() ? "bolt" : "arrow"; + return ModContent.item("copper_" + form).get().getDefaultInstance(); } @Override protected ItemStack getPickupItem() { - return ammunition.isEmpty() ? ModContent.item("copper_arrow").get().getDefaultInstance() : ammunition.copy(); + return ammunition.isEmpty() ? getDefaultPickupItem() : ammunition.copy(); } /** Used by the renderer so arrows and bolts retain their actual ammunition appearance. */ @@ -44,17 +51,25 @@ public ItemStack getItem() { @Override public void addAdditionalSaveData(CompoundTag tag) { super.addAdditionalSaveData(tag); - if (!ammunition.isEmpty()) tag.put("Ammunition", ammunition.save(new CompoundTag())); + if (!ammunition.isEmpty()) tag.put("Ammunition", ammunition.save(registryAccess())); } @Override public void readAdditionalSaveData(CompoundTag tag) { super.readAdditionalSaveData(tag); - ammunition = tag.contains("Ammunition") ? ItemStack.of(tag.getCompound("Ammunition")) : ItemStack.EMPTY; + CompoundTag saved = tag.getCompound("Ammunition"); + 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(); + } + ammunition = ItemStack.parseOptional(registryAccess(), saved); + if (!ammunition.isEmpty()) setPickupItemStack(ammunition); } - @Override public void writeSpawnData(FriendlyByteBuf buffer) { buffer.writeItem(ammunition); } - @Override public void readSpawnData(FriendlyByteBuf additionalData) { ammunition = additionalData.readItem(); } + @Override public void writeSpawnData(FriendlyByteBuf buffer) { buffer.writeNbt((CompoundTag) ammunition.saveOptional(registryAccess())); } + @Override public void readSpawnData(FriendlyByteBuf additionalData) { ammunition = ItemStack.parseOptional(registryAccess(), additionalData.readNbt()); } /** * AbstractArrow's vanilla packet omits Forge additional spawn data. The @@ -63,6 +78,6 @@ public void readAdditionalSaveData(CompoundTag tag) { */ @Override public Packet getAddEntityPacket() { - return NetworkHooks.getEntitySpawningPacket(this); + return ForgeHooks.getEntitySpawnPacket(this); } } 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 60bc1198a..72776f2da 100644 --- a/src/main/java/zone/moddev/mc/basemetals/loot/AppendLootTableModifier.java +++ b/src/main/java/zone/moddev/mc/basemetals/loot/AppendLootTableModifier.java @@ -1,6 +1,6 @@ package zone.moddev.mc.basemetals.loot; -import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.objects.ObjectArrayList; @@ -12,7 +12,7 @@ import net.minecraftforge.common.loot.LootModifier; public final class AppendLootTableModifier extends LootModifier { - public static final Codec CODEC = RecordCodecBuilder.create(instance -> + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> codecStart(instance).and(ResourceLocation.CODEC.fieldOf("table").forGetter(modifier -> modifier.table)) .apply(instance, AppendLootTableModifier::new)); private final ResourceLocation table; @@ -24,7 +24,8 @@ public AppendLootTableModifier(LootItemCondition[] conditions, ResourceLocation @Override protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { - context.getResolver().getLootTable(table).getRandomItemsRaw(context, item -> { + context.getResolver().get(net.minecraft.core.registries.Registries.LOOT_TABLE, 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); } @@ -33,5 +34,5 @@ protected ObjectArrayList doApply(ObjectArrayList generate } @Override - public Codec codec() { return CODEC; } + public MapCodec codec() { return CODEC; } } 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 a3420294e..e082288c3 100644 --- a/src/main/java/zone/moddev/mc/basemetals/loot/ModLoot.java +++ b/src/main/java/zone/moddev/mc/basemetals/loot/ModLoot.java @@ -2,7 +2,7 @@ import zone.moddev.mc.basemetals.BaseMetals; -import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; @@ -10,9 +10,9 @@ import net.minecraftforge.registries.RegistryObject; public final class ModLoot { - public static final DeferredRegister> SERIALIZERS = DeferredRegister.create( + public static final DeferredRegister> SERIALIZERS = DeferredRegister.create( ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, BaseMetals.MOD_ID); - public static final RegistryObject> ADD_TABLE = + public static final RegistryObject> ADD_TABLE = SERIALIZERS.register("add_table", () -> AppendLootTableModifier.CODEC); private ModLoot() {} 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 7cc3056c8..8f9be9365 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator.java @@ -148,7 +148,7 @@ public static void migrateIfNeeded(Path worldRoot) throws IOException { public static void refreshLoadedSingleplayerPlayer(MinecraftServer server, Path worldRoot) throws IOException { CompoundTag loaded = server.getWorldData().getLoadedPlayerTag(); if (loaded == null) return; - CompoundTag level = NbtIo.readCompressed(worldRoot.resolve("level.dat").toFile()); + 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"); @@ -173,7 +173,7 @@ private static Map legacyBlockIds(Path root) throws IOException for (String fileName : List.of("level.dat", "level.dat_old", "basemetals-legacy-registry.dat")) { Path file = root.resolve(fileName); if (!Files.isRegularFile(file)) continue; - CompoundTag candidate = NbtIo.readCompressed(file.toFile()); + CompoundTag candidate = LegacyNbt.readCompressed(file.toFile()); int dataVersion = candidate.getCompound("Data").getInt("DataVersion"); if (dataVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION) continue; Map ids = oldBlockIds(candidate); @@ -346,7 +346,7 @@ private static ItemMigration migrateLooseInventories(Path root) throws IOExcepti ItemMigration converted = ItemMigration.NONE; for (Path file : files) { if (!Files.isRegularFile(file)) continue; - CompoundTag data = NbtIo.readCompressed(file.toFile()); + CompoundTag data = LegacyNbt.readCompressed(file.toFile()); ItemMigration changed = convertLegacyItems(data); if (changed.isEmpty()) continue; Path backup = root.resolve(BACKUP_DIRECTORY).resolve(root.relativize(file)); @@ -372,14 +372,14 @@ private static ItemMigration restoreRewrittenSingleplayerPlayer(Path root) throw return ItemMigration.NONE; } - CompoundTag current = NbtIo.readCompressed(currentFile.toFile()); + 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)) { return ItemMigration.NONE; } - CompoundTag legacy = NbtIo.readCompressed(legacyFile.toFile()); + CompoundTag legacy = LegacyNbt.readCompressed(legacyFile.toFile()); CompoundTag legacyData = legacy.getCompound("Data"); int legacyVersion = legacyData.getInt("DataVersion"); if (legacyVersion > LAST_SUPPORTED_LEGACY_DATA_VERSION @@ -429,7 +429,7 @@ private static ItemMigration convertLegacyItems(Tag value) { convertedItemAliases++; } int damage = compound.getInt("Damage"); - if (item != null && item.canBeDepleted() && 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(); @@ -463,7 +463,7 @@ private static ItemMigration convertLegacyItems(Tag value) { private static void writeCompressedAtomically(Path file, CompoundTag data) throws IOException { Path temporary = file.resolveSibling(file.getFileName() + ".basemetals.tmp"); - NbtIo.writeCompressed(data, temporary.toFile()); + LegacyNbt.writeCompressed(data, temporary.toFile()); try { Files.move(temporary, file, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE); } catch (java.nio.file.AtomicMoveNotSupportedException ignored) { @@ -641,7 +641,7 @@ private static CompoundTag restoredState(LegacyBlock legacy, Map throw new IOException("Unsupported region compression type " + compression); }; try (DataInputStream data = new DataInputStream(input)) { - return NbtIo.read(data); + return LegacyNbt.read(data); } } diff --git a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyNbt.java b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyNbt.java new file mode 100644 index 000000000..8d617f831 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyNbt.java @@ -0,0 +1,35 @@ +package zone.moddev.mc.basemetals.migration; + +import java.io.DataInput; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtAccounter; +import net.minecraft.nbt.NbtIo; + +/** Disk-only NBT access for the legacy migration and its backed-up source files. */ +public final class LegacyNbt { + private LegacyNbt() {} + + public static CompoundTag readCompressed(File file) throws IOException { + return NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap()); + } + + public static CompoundTag readCompressed(InputStream input) throws IOException { + return NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap()); + } + + public static CompoundTag read(DataInput input) throws IOException { + return NbtIo.read(input, NbtAccounter.unlimitedHeap()); + } + + public static void writeCompressed(CompoundTag tag, File file) throws IOException { + NbtIo.writeCompressed(tag, file.toPath()); + } + + public static void writeCompressed(CompoundTag tag, OutputStream output) throws IOException { + NbtIo.writeCompressed(tag, output); + } +} 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 9e2699822..037a3c61b 100644 --- a/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHook.java @@ -74,7 +74,7 @@ * durability data before Minecraft reads the items. */ public final class LegacyWorldDataHook { - private static final ResourceLocation BLOCK_REGISTRY = new ResourceLocation("minecraft", "blocks"); + private static final ResourceLocation BLOCK_REGISTRY = ResourceLocation.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(); @@ -96,7 +96,7 @@ public static synchronized void prepareLegacyWorld(File levelDat) { File source = legacyRegistrySource(levelDat); if (source == null) return; try (FileInputStream input = new FileInputStream(source)) { - CompoundTag root = NbtIo.readCompressed(input); + CompoundTag root = LegacyNbt.readCompressed(input); if (root.getCompound("Data").getInt("DataVersion") < 2834) { legacyWorldActive = true; indexLegacyChunks(levelDat.getParentFile()); @@ -115,7 +115,7 @@ private static void prepareLevelMetadata(File levelDat) { try { CompoundTag root; try (FileInputStream input = new FileInputStream(levelDat)) { - root = NbtIo.readCompressed(input); + root = LegacyNbt.readCompressed(input); } boolean changed = removeRetiredVanillaProfessionRegistry(root); changed |= removeObsoleteVanillaBiomeSnapshot(root); @@ -363,7 +363,7 @@ private static synchronized void prepareLegacyData(File worldDirectory, Compound CompoundTag saved = new CompoundTag(); saved.put("FML", tag.copy()); try (FileOutputStream output = new FileOutputStream(sidecar)) { - NbtIo.writeCompressed(saved, output); + LegacyNbt.writeCompressed(saved, output); } catch (IOException exception) { throw new IllegalStateException("Could not preserve the legacy registry in " + sidecar, exception); } @@ -387,7 +387,7 @@ private static int installLegacyBlockStates(CompoundTag snapshot) { if (separator < 0) continue; String namespace = normalized.substring(0, separator); if (!BaseMetals.MOD_ID.equals(namespace) && !"mmdlib".equals(namespace)) continue; - ResourceLocation id = new ResourceLocation(normalized); + ResourceLocation id = ResourceLocation.parse(normalized); int numeric = entry.getInt("V"); ids.put(id, Integer.valueOf(numeric)); LEGACY_BASE_METALS_BLOCK_IDS.set(numeric); @@ -410,7 +410,7 @@ private static int installLegacyBlockStates(CompoundTag snapshot) { private static Block resolveCurrentBlock(ResourceLocation oldId) { String path = MissingMappings.blockTargetPath(oldId.getPath()); - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BaseMetals.MOD_ID, path)); + Block block = ForgeRegistries.BLOCKS.getValue(ResourceLocation.fromNamespaceAndPath(BaseMetals.MOD_ID, path)); if (block == null) throw new IllegalStateException("No Base Metals replacement for legacy block " + oldId); return block; } @@ -502,7 +502,7 @@ static Map legacyBlockIdsForTest(java.nio.file.Path root) throw File source = legacyRegistrySource(root.resolve("level.dat").toFile()); if (source != null) { try (FileInputStream input = new FileInputStream(source)) { - Map result = idsFromRoot(NbtIo.readCompressed(input)); + Map result = idsFromRoot(LegacyNbt.readCompressed(input)); if (!result.isEmpty()) return result; } } @@ -542,7 +542,7 @@ public static String normalizeLegacyRegistryName(String name) { } private static void migrateLoosePlayerData(File levelDat, CompoundTag root) throws IOException { - CompoundTag current = levelDat.isFile() ? NbtIo.readCompressed(levelDat) : root; + CompoundTag current = levelDat.isFile() ? LegacyNbt.readCompressed(levelDat) : root; if (migrateLegacyItems(current) > 0 && levelDat.isFile()) writeWithBackup(levelDat, current); File playerData = new File(levelDat.getParentFile(), "playerdata"); File[] files = playerData.listFiles((directory, name) -> name.endsWith(".dat")); @@ -550,7 +550,7 @@ private static void migrateLoosePlayerData(File levelDat, CompoundTag root) thro Arrays.sort(files); for (File file : files) { try (FileInputStream input = new FileInputStream(file)) { - CompoundTag player = NbtIo.readCompressed(input); + CompoundTag player = LegacyNbt.readCompressed(input); if (migrateLegacyItems(player) > 0) writeWithBackup(file, player); } } @@ -637,7 +637,7 @@ private static Map vanillaBlockEntityIds() { } private static ResourceLocation safeId(String value) { - try { return value == null || value.isEmpty() ? null : new ResourceLocation(value.toLowerCase(Locale.ROOT)); } + try { return value == null || value.isEmpty() ? null : ResourceLocation.parse(value.toLowerCase(Locale.ROOT)); } catch (RuntimeException ignored) { return null; } } @@ -646,7 +646,7 @@ private static void writeWithBackup(File file, CompoundTag data) throws IOExcept if (!backup.exists()) Files.copy(file.toPath(), backup.toPath(), StandardCopyOption.COPY_ATTRIBUTES); File temporary = new File(file.getParentFile(), file.getName() + ".basemetals.tmp"); try (FileOutputStream output = new FileOutputStream(temporary)) { - NbtIo.writeCompressed(data, output); + LegacyNbt.writeCompressed(data, output); } try { Files.move(temporary.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING, @@ -661,7 +661,7 @@ private static File legacyRegistrySource(File levelDat) { new File(levelDat.getParentFile(), REGISTRY_SIDECAR) }) { if (!candidate.isFile()) continue; try (FileInputStream input = new FileInputStream(candidate)) { - CompoundTag root = NbtIo.readCompressed(input); + CompoundTag root = LegacyNbt.readCompressed(input); if ((root.contains("FML", 10) && containsLegacyBaseMetalsRegistryEntry(root)) || (root.contains("Data", 10) && root.getCompound("Data").getInt("DataVersion") < 2834)) return candidate; } catch (IOException ignored) {} @@ -701,9 +701,9 @@ public static Map legacyPreparedBlockCounts() { static int indexLegacyChunks(File worldDirectory) { Map indexed = new LinkedHashMap<>(); - indexRegionDirectory(indexed, new ResourceLocation("minecraft:overworld"), new File(worldDirectory, "region")); - indexRegionDirectory(indexed, new ResourceLocation("minecraft:the_nether"), new File(worldDirectory, "DIM-1/region")); - indexRegionDirectory(indexed, new ResourceLocation("minecraft:the_end"), new File(worldDirectory, "DIM1/region")); + 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")); Path dimensions = worldDirectory.toPath().resolve("dimensions"); if (Files.isDirectory(dimensions)) { @@ -714,7 +714,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, new ResourceLocation(namespace, name), path.toFile()); + indexRegionDirectory(indexed, ResourceLocation.fromNamespaceAndPath(namespace, name), path.toFile()); }); } catch (IOException exception) { throw new IllegalStateException("Could not inspect saved dimensions in " + dimensions, exception); @@ -762,7 +762,7 @@ private static long chunkKey(int x, int z) { @SuppressWarnings("unchecked") private static Dynamic[] expandFlatteningTable(int requiredLength) { try { - String fieldName = ObfuscationReflectionHelper.remapName(INameMappingService.Domain.FIELD, "f_14934_"); + String fieldName = "MAP"; Field valuesField = BlockStateData.class.getDeclaredField(fieldName); valuesField.setAccessible(true); if (Modifier.isFinal(valuesField.getModifiers())) { 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 a71b30ded..aca65e0a8 100644 --- a/src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java +++ b/src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java @@ -1,104 +1,93 @@ package zone.moddev.mc.basemetals.network; -import java.util.Collections; -import java.util.function.IntSupplier; -import java.util.function.Supplier; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; - -import net.minecraftforge.network.HandshakeHandler; +import java.util.function.Consumer; + +import net.minecraft.network.protocol.Packet; +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.network.ChannelBuilder; import net.minecraftforge.network.NetworkDirection; -import net.minecraftforge.network.NetworkEvent; -import net.minecraftforge.network.NetworkRegistry; -import net.minecraftforge.network.simple.SimpleChannel; +import net.minecraftforge.network.SimpleChannel; +import net.minecraftforge.network.config.ConfigurationTaskContext; import zone.moddev.mc.basemetals.config.BaseMetalsConfig; import zone.moddev.mc.basemetals.config.ContentMode; -/** Checks the content mode before Forge lets a player join the world. */ +/** Checks the content mode during configuration, before a player can enter the world. */ public final class ContentModeNetwork { + private static final ConfigurationTask.Type TASK = new ConfigurationTask.Type("basemetals:content_mode"); private static SimpleChannel channel; private ContentModeNetwork() {} public static void register() { - channel = NetworkRegistry.newSimpleChannel(new ResourceLocation("basemetals", "content_mode"), - () -> "1", "1"::equals, "1"::equals); + channel = ChannelBuilder.named("basemetals:content_mode").networkProtocolVersion(1).simpleChannel(); - // Forge updates login state on the main thread, including acknowledgements. - channel.messageBuilder(ModeMessage.class, 0) + channel.messageBuilder(ModeMessage.class, 0, NetworkDirection.CONFIGURATION_TO_CLIENT) .encoder((message, buffer) -> buffer.writeUtf(message.mode.serializedName())) - .decoder(ModeMessage::read) - .loginIndex(message -> message.loginIndex, (message, index) -> message.loginIndex = index) - .buildLoginPacketList(local -> Collections.singletonList( - Pair.of("Base Metals content mode", new ModeMessage(BaseMetalsConfig.activeMode())))) - .consumerMainThread(ContentModeNetwork::receive) - .add(); - - channel.messageBuilder(Acknowledgement.class, 1) + .decoder(buffer -> new ModeMessage(readMode(buffer.readUtf(32)))) + .consumerMainThread((message, context) -> { + ContentMode clientMode = BaseMetalsConfig.activeMode(); + if (message.mode != clientMode) { + context.getConnection().disconnect(Component.translatable( + "config.basemetals.connection.mismatch", + Component.translatable(message.mode.translationKey()), + Component.translatable(clientMode.translationKey()))); + } else { + channel.send(new Acknowledgement(), context.getConnection()); + } + context.setPacketHandled(true); + }).add(); + + channel.messageBuilder(Acknowledgement.class, 1, NetworkDirection.CONFIGURATION_TO_SERVER) .encoder((message, buffer) -> {}) .decoder(buffer -> new Acknowledgement()) - .loginIndex(message -> message.loginIndex, (message, index) -> message.loginIndex = index) - .consumerMainThread(HandshakeHandler.indexFirst((handshake, message, context) -> - context.get().setPacketHandled(true))) - .add(); + .consumerMainThread((message, context) -> { + if (!(context.getConnection().getPacketListener() + instanceof ServerConfigurationPacketListenerImpl listener)) { + throw new IllegalStateException("Base Metals acknowledgement outside configuration"); + } + listener.finishCurrentTask(TASK); + context.setPacketHandled(true); + }).add(); + + MinecraftForge.EVENT_BUS.addListener(EventPriority.LOWEST, ContentModeNetwork::gatherTasks); } public static boolean modesMatch(String server, String client) { return ContentMode.parse(server) == ContentMode.parse(client); } - private static void receive(ModeMessage message, Supplier supplier) { - NetworkEvent.Context context = supplier.get(); - context.setPacketHandled(true); - if (context.getDirection() != NetworkDirection.LOGIN_TO_CLIENT) { - throw new IllegalStateException("Content mode received outside the client login handshake"); - } - - ContentMode clientMode = BaseMetalsConfig.activeMode(); - if (message.mode != clientMode) { - context.getNetworkManager().disconnect(net.minecraft.network.chat.Component.translatable( - "config.basemetals.connection.mismatch", - net.minecraft.network.chat.Component.translatable(message.mode.translationKey()), - net.minecraft.network.chat.Component.translatable(clientMode.translationKey()))); - return; - } - - channel.reply(new Acknowledgement(), context); + private static ContentMode readMode(String value) { + if (!ContentMode.isValid(value)) throw new IllegalArgumentException("Unknown server content mode " + value); + return ContentMode.parse(value); } - private static final class ModeMessage implements IntSupplier { - private final ContentMode mode; - private int loginIndex; - - private ModeMessage(ContentMode mode) { - this.mode = mode; - } - - private static ModeMessage read(FriendlyByteBuf buffer) { - String value = buffer.readUtf(32); - - if (!ContentMode.isValid(value)) { - throw new IllegalArgumentException("Unknown server content mode " + value); - } + private static void gatherTasks(GatherLoginConfigurationTasksEvent event) { + event.addTask(new ModeTask()); + } - return new ModeMessage(ContentMode.parse(value)); + private static final class ModeTask implements ConfigurationTask { + @Override + public void start(ConfigurationTaskContext context) { + channel.send(new ModeMessage(BaseMetalsConfig.activeMode()), context.getConnection()); + // Only the client's acknowledgement completes this task. } @Override - public int getAsInt() { - return loginIndex; + public void start(Consumer> sender) { + throw new IllegalStateException("Base Metals requires Forge's configuration task context"); } - } - - private static final class Acknowledgement implements IntSupplier { - private int loginIndex; @Override - public int getAsInt() { - return loginIndex; + public Type type() { + return TASK; } } + + private record ModeMessage(ContentMode mode) {} + private record Acknowledgement() {} } 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 fe0901b71..f0d510ca4 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java @@ -1,6 +1,8 @@ package zone.moddev.mc.basemetals.recipe; -import com.google.gson.JsonObject; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import com.google.gson.JsonSyntaxException; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; @@ -29,15 +31,17 @@ 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.getId()); + throw new IllegalArgumentException("Not an ordinary crafting recipe: " + recipe.getSerializer()); } private static final class Shaped extends ShapedRecipe { private final ShapedRecipe plain; private Shaped(ShapedRecipe plain) { - super(plain.getId(), plain.getGroup(), plain.category(), plain.getWidth(), plain.getHeight(), - plain.getIngredients(), plain.getResultItem(net.minecraft.core.RegistryAccess.EMPTY), plain.showNotification()); + 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; } @@ -47,7 +51,7 @@ public boolean matches(CraftingContainer inventory, Level world) { } @Override - public ItemStack assemble(CraftingContainer inventory, net.minecraft.core.RegistryAccess registries) { + public ItemStack assemble(CraftingContainer inventory, net.minecraft.core.HolderLookup.Provider registries) { return allowed(this) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } @@ -66,7 +70,7 @@ private static final class Shapeless extends ShapelessRecipe { private final ShapelessRecipe plain; private Shapeless(ShapelessRecipe plain) { - super(plain.getId(), plain.getGroup(), plain.category(), plain.getResultItem(net.minecraft.core.RegistryAccess.EMPTY), plain.getIngredients()); + super(plain.getGroup(), plain.category(), plain.getResultItem(net.minecraft.core.RegistryAccess.EMPTY), plain.getIngredients()); this.plain = plain; } @@ -76,7 +80,7 @@ public boolean matches(CraftingContainer inventory, Level world) { } @Override - public ItemStack assemble(CraftingContainer inventory, net.minecraft.core.RegistryAccess registries) { + public ItemStack assemble(CraftingContainer inventory, net.minecraft.core.HolderLookup.Provider registries) { return allowed(this) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } @@ -91,47 +95,17 @@ public RecipeSerializer getSerializer() { } } - private static final class Serializer - implements RecipeSerializer> { - private Serializer() {} - - @Override - public Recipe fromJson(ResourceLocation id, JsonObject json) { - JsonObject nested = GsonHelper.getAsJsonObject(json, "recipe"); - String type = GsonHelper.getAsString(nested, "type"); - if (!"minecraft:crafting_shaped".equals(type) && !"minecraft:crafting_shapeless".equals(type)) { - throw new JsonSyntaxException("Content-mode crafting requires an ordinary shaped or shapeless recipe"); - } - - return wrap(RecipeManager.fromJson(id, nested)); - } - - @Override - public Recipe fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) { - ResourceLocation serializerId = buffer.readResourceLocation(); - ResourceLocation recipeId = buffer.readResourceLocation(); - RecipeSerializer serializer = ForgeRegistries.RECIPE_SERIALIZERS.getValue(serializerId); - if (serializer == null || serializer == SERIALIZER) { - throw new IllegalArgumentException("Invalid nested recipe serializer " + serializerId); - } - Recipe nested = serializer.fromNetwork(recipeId, buffer); - if (!nested.getId().equals(id) || nested.getSerializer() == SERIALIZER) { - throw new IllegalArgumentException("Invalid nested content-mode recipe " + id); - } - return wrap(nested); - } + private static Recipe plain(Recipe recipe) { + return recipe instanceof Shaped shaped ? shaped.plain : ((Shapeless) recipe).plain; + } - @Override - public void toNetwork(FriendlyByteBuf buffer, Recipe value) { - Recipe plain = value instanceof Shaped ? ((Shaped) value).plain : ((Shapeless) value).plain; - buffer.writeResourceLocation(ForgeRegistries.RECIPE_SERIALIZERS.getKey(plain.getSerializer())); - buffer.writeResourceLocation(plain.getId()); - writePlain(buffer, plain); - } + 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); - @SuppressWarnings({"rawtypes", "unchecked"}) - private static void writePlain(FriendlyByteBuf buffer, Recipe plain) { - ((RecipeSerializer) plain.getSerializer()).toNetwork(buffer, plain); - } + @Override public MapCodec> codec() { return CODEC; } + @Override public StreamCodec> streamCodec() { return STREAM_CODEC; } } } diff --git a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentRecipeCondition.java b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentRecipeCondition.java index 64b797ab9..6a05f8b65 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/ContentRecipeCondition.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/ContentRecipeCondition.java @@ -1,40 +1,32 @@ package zone.moddev.mc.basemetals.recipe; -import com.google.gson.JsonObject; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; +import com.mojang.serialization.Codec; +import com.mojang.serialization.DynamicOps; +import com.mojang.serialization.MapCodec; import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import zone.moddev.mc.basemetals.BaseMetals; import zone.moddev.mc.basemetals.config.ContentPolicy; /** Applies the selected mode to Base Metals outputs made by optional machines. */ public record ContentRecipeCondition(String item) implements ICondition { - private static final ResourceLocation ID = new ResourceLocation("basemetals", "content_mode"); + public static final MapCodec CODEC = + Codec.STRING.fieldOf("item").xmap(ContentRecipeCondition::new, ContentRecipeCondition::item); + public static final DeferredRegister> SERIALIZERS = + DeferredRegister.create(ForgeRegistries.Keys.CONDITION_SERIALIZERS, BaseMetals.MOD_ID); - @Override - public ResourceLocation getID() { - return ID; + static { + SERIALIZERS.register("content_mode", () -> CODEC); } @Override - public boolean test(ICondition.IContext context) { + public boolean test(IContext context, DynamicOps ops) { return ContentPolicy.active().allows(item); } - public static final class Serializer implements IConditionSerializer { - @Override - public ResourceLocation getID() { - return ID; - } - - @Override - public void write(JsonObject json, ContentRecipeCondition condition) { - json.addProperty("item", condition.item()); - } - @Override - public ContentRecipeCondition read(JsonObject json) { - return new ContentRecipeCondition(GsonHelper.getAsString(json, "item")); - } + @Override + public MapCodec codec() { + return 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 f8af441d5..ba3062de5 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/CrushingRecipe.java @@ -1,6 +1,9 @@ package zone.moddev.mc.basemetals.recipe; -import com.google.gson.JsonObject; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import zone.moddev.mc.basemetals.BaseMetals; import net.minecraft.core.NonNullList; @@ -35,21 +38,18 @@ public final class CrushingRecipe implements Recipe { public static final RegistryObject>> CONTENT_CRAFTING_SERIALIZER = SERIALIZERS.register("content_crafting", () -> ContentCraftingRecipe.SERIALIZER); - private final ResourceLocation id; private final Ingredient ingredient; private final ItemStack result; - public CrushingRecipe(ResourceLocation id, Ingredient ingredient, ItemStack result) { - this.id = id; + public CrushingRecipe(Ingredient ingredient, ItemStack result) { this.ingredient = ingredient; this.result = result.copy(); } @Override public boolean matches(Container container, Level level) { return ingredient.test(container.getItem(0)); } - @Override public ItemStack assemble(Container container, net.minecraft.core.RegistryAccess registries) { return result.copy(); } + @Override public ItemStack assemble(Container container, 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.RegistryAccess registries) { return result.copy(); } - @Override public ResourceLocation getId() { return id; } + @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); } @@ -62,25 +62,20 @@ public String toString() { } } - public static final class Serializer - implements RecipeSerializer { - @Override - public CrushingRecipe fromJson(ResourceLocation id, JsonObject json) { - Ingredient ingredient = Ingredient.fromJson(json.get("ingredient")); - JsonObject resultJson = GsonHelper.getAsJsonObject(json, "result"); - ItemStack result = net.minecraftforge.common.crafting.CraftingHelper.getItemStack(resultJson, true); - return new CrushingRecipe(id, ingredient, result); - } + 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), + ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.result)) + .apply(instance, CrushingRecipe::new)); - @Override - public CrushingRecipe fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) { - return new CrushingRecipe(id, Ingredient.fromNetwork(buffer), buffer.readItem()); - } + private static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.ingredient, + ItemStack.STREAM_CODEC, recipe -> recipe.result, + CrushingRecipe::new); - @Override - public void toNetwork(FriendlyByteBuf buffer, CrushingRecipe recipe) { - recipe.ingredient.toNetwork(buffer); - buffer.writeItem(recipe.result); - } + @Override public MapCodec codec() { return CODEC; } + @Override public StreamCodec streamCodec() { return STREAM_CODEC; } } } 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 c467a2bdc..6c83cd59e 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/LegacySmeltingRecipe.java @@ -1,6 +1,11 @@ package zone.moddev.mc.basemetals.recipe; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -9,7 +14,6 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.SmeltingRecipe; -import net.minecraftforge.common.crafting.CraftingHelper; /** * Furnace recipe serializer which retains the counted outputs supported by the @@ -17,9 +21,9 @@ * item ID and therefore cannot express the old multi-ingot recycling recipes. */ public final class LegacySmeltingRecipe extends SmeltingRecipe { - public LegacySmeltingRecipe(ResourceLocation id, String group, Ingredient ingredient, + public LegacySmeltingRecipe(String group, Ingredient ingredient, ItemStack result, float experience, int cookingTime) { - super(id, group, net.minecraft.world.item.crafting.CookingBookCategory.MISC, ingredient, result, experience, cookingTime); + super(group, net.minecraft.world.item.crafting.CookingBookCategory.MISC, ingredient, result, experience, cookingTime); } @Override @@ -29,7 +33,7 @@ public boolean matches(net.minecraft.world.Container inventory, net.minecraft.wo } @Override - public ItemStack assemble(net.minecraft.world.Container inventory, net.minecraft.core.RegistryAccess registries) { + public ItemStack assemble(net.minecraft.world.Container inventory, net.minecraft.core.HolderLookup.Provider registries) { return zone.moddev.mc.basemetals.config.ContentPolicy.active().allows(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(getResultItem(registries).getItem()).toString()) ? super.assemble(inventory, registries) : ItemStack.EMPTY; } @@ -39,36 +43,26 @@ public RecipeSerializer getSerializer() { return CrushingRecipe.LEGACY_SMELTING_SERIALIZER.get(); } - public static final class Serializer - implements RecipeSerializer { - @Override - public LegacySmeltingRecipe fromJson(ResourceLocation id, JsonObject json) { - String group = GsonHelper.getAsString(json, "group", ""); - Ingredient ingredient = Ingredient.fromJson(json.get("ingredient")); - ItemStack result = CraftingHelper.getItemStack( - GsonHelper.getAsJsonObject(json, "result"), true); - float experience = GsonHelper.getAsFloat(json, "experience", 0.0F); - int cookingTime = GsonHelper.getAsInt(json, "cookingtime", 200); - return new LegacySmeltingRecipe(id, group, ingredient, result, experience, cookingTime); - } + 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)) + .apply(instance, LegacySmeltingRecipe::new)); - @Override - public LegacySmeltingRecipe fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) { - String group = buffer.readUtf(); - Ingredient ingredient = Ingredient.fromNetwork(buffer); - ItemStack result = buffer.readItem(); - float experience = buffer.readFloat(); - int cookingTime = buffer.readVarInt(); - return new LegacySmeltingRecipe(id, group, ingredient, result, experience, cookingTime); - } + 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, + LegacySmeltingRecipe::new); - @Override - public void toNetwork(FriendlyByteBuf buffer, LegacySmeltingRecipe recipe) { - buffer.writeUtf(recipe.getGroup()); - recipe.getIngredients().get(0).toNetwork(buffer); - buffer.writeItem(recipe.getResultItem(net.minecraft.core.RegistryAccess.EMPTY)); - buffer.writeFloat(recipe.getExperience()); - buffer.writeVarInt(recipe.getCookingTime()); - } + @Override public MapCodec codec() { return CODEC; } + @Override public StreamCodec streamCodec() { return STREAM_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 d5469b39e..9412a2d7e 100644 --- a/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java +++ b/src/main/java/zone/moddev/mc/basemetals/recipe/PlateRepairRecipe.java @@ -1,6 +1,12 @@ package zone.moddev.mc.basemetals.recipe; -import com.google.gson.JsonObject; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.core.registries.Registries; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; @@ -23,8 +29,8 @@ public final class PlateRepairRecipe extends CustomRecipe { private final Item target; private final Ingredient plate; - public PlateRepairRecipe(ResourceLocation id, Item target, Ingredient plate) { - super(id, net.minecraft.world.item.crafting.CraftingBookCategory.MISC); + public PlateRepairRecipe(Item target, Ingredient plate) { + super(net.minecraft.world.item.crafting.CraftingBookCategory.MISC); this.target = target; this.plate = plate; } @@ -49,7 +55,7 @@ public boolean matches(CraftingContainer container, Level level) { } @Override - public ItemStack assemble(CraftingContainer container, net.minecraft.core.RegistryAccess registries) { + public ItemStack assemble(CraftingContainer container, net.minecraft.core.HolderLookup.Provider registries) { if (!matches(container, null)) return ItemStack.EMPTY; for (int slot = 0; slot < container.getContainerSize(); slot++) { ItemStack stack = container.getItem(slot); @@ -69,7 +75,7 @@ public boolean canCraftInDimensions(int width, int height) { } @Override - public ItemStack getResultItem(net.minecraft.core.RegistryAccess registries) { + public ItemStack getResultItem(net.minecraft.core.HolderLookup.Provider registries) { return target.getDefaultInstance(); } @@ -83,32 +89,20 @@ public RecipeSerializer getSerializer() { return CrushingRecipe.PLATE_REPAIR_SERIALIZER.get(); } - public static final class Serializer - implements RecipeSerializer { - @Override - public PlateRepairRecipe fromJson(ResourceLocation id, JsonObject json) { - ResourceLocation targetId = new ResourceLocation(GsonHelper.getAsString(json, "target")); - Item target = ForgeRegistries.ITEMS.getValue(targetId); - if (target == null || target == Items.AIR) { - throw new com.google.gson.JsonSyntaxException("Unknown plate-repair target " + targetId); - } - return new PlateRepairRecipe(id, target, - Ingredient.fromJson(GsonHelper.getAsJsonObject(json, "plate"))); - } + public static final class Serializer implements RecipeSerializer { + private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + BuiltInRegistries.ITEM.byNameCodec().fieldOf("target").forGetter(recipe -> recipe.target), + Ingredient.CODEC_NONEMPTY.fieldOf("plate").forGetter(recipe -> recipe.plate)) + .apply(instance, PlateRepairRecipe::new)); - @Override - public PlateRepairRecipe fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) { - Item target = ForgeRegistries.ITEMS.getValue(buffer.readResourceLocation()); - if (target == null || target == Items.AIR) { - throw new IllegalStateException("Missing plate-repair target"); - } - return new PlateRepairRecipe(id, target, Ingredient.fromNetwork(buffer)); - } + private static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.registry(Registries.ITEM), recipe -> recipe.target, + Ingredient.CONTENTS_STREAM_CODEC, recipe -> recipe.plate, + PlateRepairRecipe::new); - @Override - public void toNetwork(FriendlyByteBuf buffer, PlateRepairRecipe recipe) { - buffer.writeResourceLocation(ForgeRegistries.ITEMS.getKey(recipe.target)); - recipe.plate.toNetwork(buffer); - } + @Override public MapCodec codec() { return CODEC; } + @Override public StreamCodec streamCodec() { return 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 32bd8d395..baf9a1464 100644 --- a/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java +++ b/src/main/java/zone/moddev/mc/basemetals/trade/BaseMetalsTrades.java @@ -99,15 +99,15 @@ private static ItemListing selling(Item item, int emeralds) { } private static ItemListing selling(Item item, int count, int emeralds) { - return (trader, random) -> new MerchantOffer(new ItemStack(Items.EMERALD, Math.max(1, emeralds)), + return (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) -> { int enchantmentLevel = 5 + random.nextInt(15); - ItemStack result = EnchantmentHelper.enchantItem(random, new ItemStack(item), enchantmentLevel, false); - return new MerchantOffer(new ItemStack(Items.EMERALD, Math.min(64, baseCost + enchantmentLevel)), + ItemStack result = EnchantmentHelper.enchantItem(trader.level().enabledFeatures(), random, new ItemStack(item), enchantmentLevel, false); + return new MerchantOffer(new net.minecraft.world.item.trading.ItemCost(Items.EMERALD, Math.min(64, baseCost + enchantmentLevel)), result, 3, 15, 0.2F); }; } diff --git a/src/main/resources/META-INF/coremods.json b/src/main/resources/META-INF/coremods.json index 1e41b9927..2bf71a9de 100644 --- a/src/main/resources/META-INF/coremods.json +++ b/src/main/resources/META-INF/coremods.json @@ -1,4 +1,3 @@ { - "basemetals_118_compatibility": "coremods/basemetals_118_compatibility.js", - "basemetals_connection_read_interest": "coremods/connection_read_interest.js" + "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 75dbe8254..bdf5df472 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,7 +1,7 @@ modLoader="javafml" loaderVersion="${loader_version_range}" license="${mod_license}" -issueTrackerURL="https://github.com/SkyBlade1978/BaseMetals/issues" +issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/BaseMetals/issues" [[mods]] modId="${mod_id}" @@ -14,7 +14,7 @@ description='''${mod_description}''' [[dependencies.${mod_id}]] modId="orespawn" mandatory=true -versionRange="[4.1.0.120011,5.0.0)" +versionRange="[4.1.0.120061,5.0.0)" ordering="AFTER" side="BOTH" @@ -31,32 +31,3 @@ mandatory=true versionRange="${minecraft_version_range}" ordering="NONE" side="BOTH" - -[[dependencies.${mod_id}]] -modId="mekanism" -mandatory=false -versionRange="[10.2,11)" -ordering="AFTER" -side="BOTH" - -[[dependencies.${mod_id}]] -modId="thermal_expansion" -mandatory=false -versionRange="[11,12)" -ordering="AFTER" -side="BOTH" - -[[dependencies.${mod_id}]] -modId="tconstruct" -mandatory=false -versionRange="[3.7,4)" -ordering="AFTER" -side="BOTH" - -[[dependencies.${mod_id}]] -modId="enderio" -mandatory=false -# Ender IO 6 uses prerelease version suffixes, including its supported beta builds. -versionRange="(5,7)" -ordering="AFTER" -side="BOTH" diff --git a/src/main/resources/coremods/basemetals_118_compatibility.js b/src/main/resources/coremods/basemetals_118_compatibility.js index a8b18baef..472da246f 100644 --- a/src/main/resources/coremods/basemetals_118_compatibility.js +++ b/src/main/resources/coremods/basemetals_118_compatibility.js @@ -18,7 +18,7 @@ function initializeCoreMod() { var patched = false; for (var i = 0; i < node.fields.size(); ++i) { var field = node.fields.get(i); - if (field.name !== ASMAPI.mapField('f_14934_') + 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; @@ -34,14 +34,11 @@ function initializeCoreMod() { var patched = false; for (var i = 0; i < node.methods.size(); ++i) { var method = node.methods.get(i); - if (method.desc !== '(Lcom/mojang/serialization/DynamicOps;' + - 'Lnet/minecraft/world/level/WorldDataConfiguration;' + - 'Lnet/minecraft/core/Registry;' + - 'Lcom/mojang/serialization/Lifecycle;' + - 'Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)' + - 'Lcom/mojang/datafixers/util/Pair;') continue; + 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, 4)); + 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, @@ -53,36 +50,6 @@ function initializeCoreMod() { return node; } }, - 'basemetals_legacy_forge_snapshot': { - 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess' }, - 'transformer': function(node) { - var patched = false; - for (var i = 0; i < node.methods.size(); ++i) { - var method = node.methods.get(i); - if (method.desc !== '(Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Ljava/lang/String;') continue; - var readsSnapshot = false; - for (var instruction = method.instructions.getFirst(); instruction !== null; - instruction = instruction.getNext()) { - if (instruction instanceof MethodInsnNode - && instruction.owner === 'net/minecraftforge/common/ForgeHooks' - && instruction.name === 'readAdditionalLevelSaveData') readsSnapshot = true; - } - if (!readsSnapshot) continue; - - // Forge reads its saved registry index before vanilla converts level.dat. - var prefix = new InsnList(); - prefix.add(new VarInsnNode(Opcodes.ALOAD, 1)); - 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 prepare the saved Forge registry snapshot'); - return node; - } - }, 'basemetals_legacy_chunk_status': { 'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.level.chunk.storage.ChunkStorage' }, 'transformer': function(node) { @@ -119,7 +86,7 @@ function initializeCoreMod() { 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 !== ASMAPI.mapMethod('m_180807_') + if (method.name !== 'ensureCanWrite' || method.desc !== '(Lnet/minecraft/core/BlockPos;)Z') continue; var allowed = new LabelNode(); var prefix = new InsnList(); diff --git a/src/main/resources/coremods/connection_read_interest.js b/src/main/resources/coremods/connection_read_interest.js deleted file mode 100644 index 1b784a7fa..000000000 --- a/src/main/resources/coremods/connection_read_interest.js +++ /dev/null @@ -1,90 +0,0 @@ -var Opcodes = Java.type('org.objectweb.asm.Opcodes'); -var InsnList = Java.type('org.objectweb.asm.tree.InsnList'); -var FieldInsnNode = Java.type('org.objectweb.asm.tree.FieldInsnNode'); -var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); -var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); -var ASMAPI = Java.type('net.minecraftforge.coremod.api.ASMAPI'); - -function initializeCoreMod() { - return { - 'basemetals_connection_read_interest': { - 'target': { 'type': 'CLASS', 'name': 'net.minecraft.network.Connection' }, - 'transformer': serializeReadChanges - } - }; -} - -function serializeReadChanges(node) { - var packet = 'Lnet/minecraft/network/protocol/Packet;'; - var listener = 'Lnet/minecraft/network/PacketSendListener;'; - var protocol = 'Lnet/minecraft/network/ConnectionProtocol;'; - var sender = findMethod(node, ASMAPI.mapMethod('m_129520_'), '(' + packet + listener + ')V'); - var writer = findMethod(node, ASMAPI.mapMethod('m_243087_'), '(' + packet + listener + protocol + protocol + ')V'); - var pause = findCall(sender, 'io/netty/channel/ChannelConfig', 'setAutoRead'); - - if (pause === null && findCall(writer, 'io/netty/channel/ChannelConfig', 'setAutoRead') !== null) { - return node; - } - if (pause === null || findCall(writer, 'io/netty/channel/ChannelConfig', 'setAutoRead') !== null) { - throw new Error('Base Metals found an unexpected Connection read-pause layout'); - } - - var value = previousCode(pause); - var config = previousCode(value); - var channel = previousCode(config); - var self = previousCode(channel); - var discard = pause.getNext(); - var changeProtocol = findCall(writer, node.name, ASMAPI.mapMethod('m_129498_')); - var newProtocol = changeProtocol === null ? null : previousCode(changeProtocol); - var receiver = newProtocol === null ? null : previousCode(newProtocol); - - if (value === null || value.getOpcode() !== Opcodes.ICONST_0 - || !(config instanceof MethodInsnNode) || config.name !== 'config' - || !(channel instanceof FieldInsnNode) || channel.desc !== 'Lio/netty/channel/Channel;' - || !(self instanceof VarInsnNode) || self.getOpcode() !== Opcodes.ALOAD || self.var !== 0 - || discard === null || discard.getOpcode() !== Opcodes.POP - || !(receiver instanceof VarInsnNode) || receiver.getOpcode() !== Opcodes.ALOAD || receiver.var !== 0 - || !(newProtocol instanceof VarInsnNode) || newProtocol.var !== 3) { - throw new Error('Base Metals could not move Connection read changes onto the event loop'); - } - - // Forge resumes reads on the event loop. Pause them there too, so a delayed - // off-thread pause cannot erase the newer socket read request during login. - var instructions = new InsnList(); - var instruction = self; - var end = discard.getNext(); - while (instruction !== end) { - var next = instruction.getNext(); - sender.instructions.remove(instruction); - instructions.add(instruction); - instruction = next; - } - writer.instructions.insertBefore(receiver, instructions); - return node; -} - -function findMethod(node, name, descriptor) { - for (var i = 0; i < node.methods.size(); ++i) { - var method = node.methods.get(i); - if (method.name === name && method.desc === descriptor) return method; - } - throw new Error('Base Metals could not find Connection.' + name + descriptor); -} - -function findCall(method, owner, name) { - var found = null; - for (var instruction = method.instructions.getFirst(); instruction !== null; instruction = instruction.getNext()) { - if (instruction instanceof MethodInsnNode && instruction.owner === owner && instruction.name === name) { - if (found !== null) throw new Error('Base Metals found duplicate calls to ' + owner + '.' + name); - found = instruction; - } - } - return found; -} - -function previousCode(instruction) { - if (instruction === null) return null; - var previous = instruction.getPrevious(); - while (previous !== null && previous.getOpcode() < 0) previous = previous.getPrevious(); - return previous; -} diff --git a/src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json b/src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json index 9239ca7ad..2e7d7c23f 100644 --- a/src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json +++ b/src/main/resources/data/basemetals/tags/blocks/scythe_harvestable.json @@ -24,7 +24,7 @@ "minecraft:azalea_leaves", "minecraft:flowering_azalea_leaves", "minecraft:cobweb", - "minecraft:grass", + "minecraft:short_grass", "minecraft:fern", "minecraft:dead_bush", "minecraft:seagrass", diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index c3bc90957..f000f6e7f 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,7 @@ { "pack": { "description": "${mod_id} resources", - "pack_format": 15, - "forge:server_data_pack_format": 15 + "pack_format": 32, + "supported_formats": {"min_inclusive": 32, "max_inclusive": 41} } } 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 b3f33515e..1f8b22350 100644 --- a/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java +++ b/src/packagedClientSmoke/java/zone/moddev/mc/basemetals/smoke/RemoteLoginSmoke.java @@ -20,6 +20,7 @@ public final class RemoteLoginSmoke { private static int ticks; private static int titleTicks; private static int joinedTicks; + private static int connections; private RemoteLoginSmoke() {} @@ -37,17 +38,28 @@ public static void tick(TickEvent.ClientTickEvent event) { connecting = true; String address = System.getProperty("basemetals.remoteAddress"); ConnectScreen.startConnecting(minecraft.screen, minecraft, ServerAddress.parseString(address), - new net.minecraft.client.multiplayer.ServerData("Base Metals smoke", address, false), false); + new net.minecraft.client.multiplayer.ServerData("Base Metals smoke", address, + net.minecraft.client.multiplayer.ServerData.Type.OTHER), false, null); } 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(new ResourceLocation("basemetals:adamantine_bow")) + var recipe = minecraft.level.getRecipeManager().byKey(ResourceLocation.parse("basemetals:adamantine_bow")) .orElseThrow(); - if (recipe.isSpecial() != (BaseMetalsConfig.activeMode() == ContentMode.LOW_FANTASY)) { + if (recipe.value().isSpecial() != (BaseMetalsConfig.activeMode() == ContentMode.LOW_FANTASY)) { throw new IllegalStateException("MODE_LOGIN_SMOKE FAIL: recipe policy was not synchronized"); } - finish(minecraft, "connected"); + connections++; + if (connections < Integer.getInteger("basemetals.loginSmokeConnections", 1)) { + BaseMetals.LOGGER.info("BASEMETALS_MODE_RECONNECT connection={}", connections); + minecraft.level.disconnect(); + minecraft.disconnect(new TitleScreen()); + connecting = false; + titleTicks = 0; + joinedTicks = 0; + } else { + finish(minecraft, "connected"); + } } else if (minecraft.screen instanceof DisconnectedScreen) { StringBuilder reason = new StringBuilder(); try { diff --git a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml index 3eb7a3092..c542d375a 100644 --- a/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml +++ b/src/packagedClientSmoke/packaged-resources/META-INF/mods.toml @@ -10,13 +10,13 @@ displayName="Base Metals packaged client smoke" [[dependencies.basemetals_client_smoke]] modId="basemetals" mandatory=true -versionRange="[3.1.0.120011]" +versionRange="[3.1.0.120061]" ordering="AFTER" side="CLIENT" [[dependencies.basemetals_client_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.120011]" +versionRange="[4.1.0.120061]" ordering="AFTER" side="CLIENT" diff --git a/src/packagedClientSmoke/packaged-resources/pack.mcmeta b/src/packagedClientSmoke/packaged-resources/pack.mcmeta index 78cb38073..b379cdd46 100644 --- a/src/packagedClientSmoke/packaged-resources/pack.mcmeta +++ b/src/packagedClientSmoke/packaged-resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Base Metals packaged client smoke resources", - "pack_format": 8 + "pack_format": 32 } } 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 8cf478fed..33e0d4574 100644 --- a/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java +++ b/src/packagedServerSmoke/java/zone/moddev/mc/basemetals/smoke/PackagedServerSmoke.java @@ -38,7 +38,7 @@ public PackagedServerSmoke() { public void onServerStarted(ServerStartedEvent event) throws IOException { String baseMetals = version("basemetals"); String oreSpawn = version("orespawn"); - if (!"3.1.0.120011".equals(baseMetals) || !"4.1.0.120011".equals(oreSpawn)) { + if (!"3.1.0.120061".equals(baseMetals) || !"4.1.0.120061".equals(oreSpawn)) { throw new IllegalStateException("PACKAGED_SERVER_SMOKE FAIL versions basemetals=" + baseMetals + " orespawn=" + oreSpawn); } @@ -83,7 +83,7 @@ private static void verifyContent(net.minecraft.server.MinecraftServer server) t } var bow = server.getRecipeManager().byKey(new net.minecraft.resources.ResourceLocation("basemetals:adamantine_bow")) .orElseThrow(); - boolean enabled = !bow.isSpecial(); + 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"); } @@ -158,24 +158,6 @@ private static void verifyOreSample(net.minecraft.server.MinecraftServer server) } private static void verifyTinkers() { - var mode = zone.moddev.mc.basemetals.config.BaseMetalsConfig.activeMode(); - var registry = slimeknights.tconstruct.library.materials.MaterialRegistry.getInstance(); - for (String material : zone.moddev.mc.basemetals.material.MaterialCatalogue.BY_NAME.keySet()) { - var id = new slimeknights.tconstruct.library.materials.definition.MaterialId("basemetals:" + material); - for (String stat : new String[] {"head", "handle", "limb", "grip"}) { - boolean expected = zone.moddev.mc.basemetals.material.MaterialCatalogue.get(material).hasEquipment() - && zone.moddev.mc.basemetals.compat.TinkersContentPolicy.allows(mode, material, - "tconstruct:" + stat); - if ("steel".equals(material) && Boolean.getBoolean("basemetals.tinkersOverrideSmoke")) expected = true; - boolean present = registry.getMaterialStats(id, - new slimeknights.tconstruct.library.materials.stats.MaterialStatsId("tconstruct:" + stat)).isPresent(); - if (present != expected) throw new IllegalStateException("Tinkers " + id + "/" + stat - + " is present=" + present + " in " + mode); - } - } - LOGGER.info("BASEMETALS_PACKAGED_TINKERS_POLICY PASS mode={}", mode.serializedName()); - if (Boolean.getBoolean("basemetals.tinkersOverrideSmoke")) { - LOGGER.info("BASEMETALS_TINKERS_OVERRIDE PASS material=steel mode={}", mode.serializedName()); - } + throw new IllegalStateException("Tinkers has no supported Forge 1.20.6 release"); } } diff --git a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml index f6e6d50c8..c12c4d618 100644 --- a/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml +++ b/src/packagedServerSmoke/packaged-resources/META-INF/mods.toml @@ -10,13 +10,13 @@ displayName="Base Metals packaged server smoke" [[dependencies.basemetals_server_smoke]] modId="basemetals" mandatory=true -versionRange="[3.1.0.120011]" +versionRange="[3.1.0.120061]" ordering="AFTER" side="SERVER" [[dependencies.basemetals_server_smoke]] modId="orespawn" mandatory=true -versionRange="[4.1.0.120011]" +versionRange="[4.1.0.120061]" ordering="AFTER" side="SERVER" diff --git a/src/packagedServerSmoke/packaged-resources/pack.mcmeta b/src/packagedServerSmoke/packaged-resources/pack.mcmeta index d70a89810..34648520c 100644 --- a/src/packagedServerSmoke/packaged-resources/pack.mcmeta +++ b/src/packagedServerSmoke/packaged-resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 8, + "pack_format": 41, "description": "Base Metals release validation probe" } } diff --git a/src/packagedServerSmoke/resources/fixtures/tinkers-steel-override/pack.mcmeta b/src/packagedServerSmoke/resources/fixtures/tinkers-steel-override/pack.mcmeta index fbeca076c..ab8a7c6b7 100644 --- a/src/packagedServerSmoke/resources/fixtures/tinkers-steel-override/pack.mcmeta +++ b/src/packagedServerSmoke/resources/fixtures/tinkers-steel-override/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 9, + "pack_format": 41, "description": "Tests an explicit steel material override in Low Fantasy." } } diff --git a/src/smoke/datapack/pack.mcmeta b/src/smoke/datapack/pack.mcmeta index 53bc7859e..0faec4659 100644 --- a/src/smoke/datapack/pack.mcmeta +++ b/src/smoke/datapack/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 15, + "pack_format": 41, "description": "Base Metals custom ordinary dimension smoke fixture" } } diff --git a/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java b/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java index e221cff8f..b0103ddca 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ForwardPortRegressionTest.java @@ -20,7 +20,7 @@ void doorsUseSixIngredientsAndRailsYieldSixteen() throws Exception { @Test void obsidianNuggetsProduceAnIngotNotAWholeBlock() throws Exception { assertEquals("basemetals:obsidian_ingot", - recipe("obsidian_ingot").getAsJsonObject("result").get("item").getAsString()); + recipe("obsidian_ingot").getAsJsonObject("result").get("id").getAsString()); } @Test diff --git a/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java b/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java index 4d9630884..ec0657135 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/IntegrationContentPolicyTest.java @@ -23,7 +23,7 @@ void everyBundledMachineItemOutputHasAContentCondition() throws Exception { Set outputs = new LinkedHashSet<>(); for (String field : new String[] {"result", "output", "outputs"}) collect(recipe.get(field), outputs); Set guarded = new LinkedHashSet<>(); - for (var condition : recipe.getAsJsonArray("conditions")) { + for (var condition : recipe.getAsJsonObject("forge:condition").getAsJsonArray("values")) { var value = condition.getAsJsonObject(); if ("basemetals:content_mode".equals(value.get("type").getAsString())) { guarded.add(value.get("item").getAsString()); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1201ResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1206ResourceTest.java similarity index 85% rename from src/test/java/zone/moddev/mc/basemetals/data/Minecraft1201ResourceTest.java rename to src/test/java/zone/moddev/mc/basemetals/data/Minecraft1206ResourceTest.java index 6968e79d0..0623b6f46 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1201ResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/Minecraft1206ResourceTest.java @@ -12,12 +12,14 @@ import com.google.gson.JsonParser; import org.junit.jupiter.api.Test; -class Minecraft1201ResourceTest { +class Minecraft1206ResourceTest { @Test - void resourceAndDataPacksUseThe1201Format() throws Exception { + void resourceAndDataPacksUseThe1206Formats() throws Exception { var pack = read("src/main/resources/pack.mcmeta").getAsJsonObject("pack"); - assertEquals(15, pack.get("pack_format").getAsInt()); - assertEquals(15, pack.get("forge:server_data_pack_format").getAsInt()); + assertEquals(32, pack.get("pack_format").getAsInt()); + var formats = pack.getAsJsonObject("supported_formats"); + assertEquals(32, formats.get("min_inclusive").getAsInt()); + assertEquals(41, formats.get("max_inclusive").getAsInt()); } @Test @@ -38,7 +40,7 @@ void scythesKeepTheirPlantAndCobwebHarvestingTag() throws Exception { } @Test - void tinkersStatsUseRegistered1201Types() throws Exception { + void dormantTinkersStatsRetainTheirSourceFormat() throws Exception { var stats = read("src/generated/resources/data/basemetals/tinkering/materials/stats/steel.json") .getAsJsonObject("stats"); assertFalse(stats.has("tconstruct:extra")); diff --git a/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java b/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java index a7676a45e..f86bd5775 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/RawMaterialResourceTest.java @@ -24,12 +24,12 @@ class RawMaterialResourceTest { void allRawMetalsHaveOneToOneProcessingAndDistinctTags() throws Exception { for (String metal : METALS) { JsonObject crushing = read("data/basemetals/recipes/" + metal + "_raw_crushing.json"); - assertEquals("basemetals:" + metal + "_powder", crushing.getAsJsonObject("result").get("item").getAsString()); + assertEquals("basemetals:" + metal + "_powder", crushing.getAsJsonObject("result").get("id").getAsString()); assertEquals(1, (crushing.getAsJsonObject("result").has("count") ? crushing.getAsJsonObject("result").get("count").getAsInt() : 1)); for (String cooking : List.of("smelting", "blasting")) { JsonObject recipe = read("data/basemetals/recipes/" + metal + "_raw_" + cooking + ".json"); - assertEquals("basemetals:" + metal + "_ingot", recipe.get("result").getAsString()); + assertEquals("basemetals:" + metal + "_ingot", recipe.getAsJsonObject("result").get("id").getAsString()); } String rawTag = Files.readString(GENERATED.resolve("data/forge/tags/items/raw_materials/" + metal + ".json")); 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 da0ad3819..16d46af21 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/RecipeRegressionTest.java @@ -89,7 +89,7 @@ void everyCraftingRecipeHasThe112MaterialDiscoveryTrigger() throws Exception { .get(0).getAsJsonObject(); String actual = expected[0].equals("item") ? predicate.getAsJsonArray("items").get(0).getAsString() - : predicate.get(expected[0]).getAsString(); + : predicate.get("items").getAsString().substring(1); assertEquals(expected[1], actual, name); assertEquals(1, advancement.getAsJsonArray("requirements").size(), name); assertTrue(advancement.getAsJsonArray("requirements").get(0).getAsJsonArray().toString() @@ -106,8 +106,8 @@ void existing113RecipeAdvancementCriteriaRemainAvailable() throws Exception { JsonObject criteria = read(DATA.resolve("advancements/recipes/adamantine_bow.json")) .getAsJsonObject("criteria"); assertEquals("minecraft:recipe_unlocked", criteria.getAsJsonObject("has_recipe").get("trigger").getAsString()); - assertEquals("forge:rods/adamantine", criteria.getAsJsonObject("has_ingredient_1") - .getAsJsonObject("conditions").getAsJsonArray("items").get(0).getAsJsonObject().get("tag").getAsString()); + assertEquals("#forge:rods/adamantine", criteria.getAsJsonObject("has_ingredient_1") + .getAsJsonObject("conditions").getAsJsonArray("items").get(0).getAsJsonObject().get("items").getAsString()); } @Test @@ -122,7 +122,7 @@ void obsidianCannotBeMultipliedThroughCrushingAndCompacting() throws Exception { assertEquals("forge:ingots/obsidian", block.getAsJsonObject("key").getAsJsonObject("X") .get("tag").getAsString()); assertEquals("basemetals:obsidian_ingot", read(DATA.resolve("recipes/obsidian_ingot.json")) - .getAsJsonObject("result").get("item").getAsString()); + .getAsJsonObject("result").get("id").getAsString()); assertFalse(block.get("pattern").equals(read(DATA.resolve("recipes/obsidian_bars.json")) .get("pattern")), "Obsidian blocks must not collide with bars"); } @@ -143,7 +143,7 @@ void craftingAndRecyclingCannotIncreaseTheSameMaterial() throws Exception { if (craft == null || !craft.has("pattern")) continue; JsonObject result = entry.getValue().getAsJsonObject("result"); - String output = result.get("item").getAsString().split(":")[1]; + String output = result.get("id").getAsString().split(":")[1]; String material = output.contains("_") ? output.substring(0, output.indexOf('_')) : output; double spent = 0; for (com.google.gson.JsonElement row : craft.getAsJsonArray("pattern")) { 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 7f59fd053..2ad8c784a 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java @@ -604,7 +604,7 @@ private static void validateTagTree(Path dataRoot, String kind, Set regi private static void assertConditionalRecipe(String id, String modId) throws Exception { JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); - JsonObject condition = recipe.getAsJsonArray("conditions").get(0).getAsJsonObject(); + JsonObject condition = recipe.getAsJsonObject("forge:condition").getAsJsonArray("values").get(0).getAsJsonObject(); assertEquals("forge:mod_loaded", condition.get("type").getAsString(), id); assertEquals(modId, condition.get("modid").getAsString(), id); } @@ -614,7 +614,7 @@ private static void assertCrushingRecipe(String id, String ingredientKind, Strin JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); assertEquals("basemetals:crushing", recipe.get("type").getAsString(), id); assertEquals(ingredient, recipe.getAsJsonObject("ingredient").get(ingredientKind).getAsString(), id); - assertEquals(result, recipe.getAsJsonObject("result").get("item").getAsString(), id); + assertEquals(result, recipe.getAsJsonObject("result").get("id").getAsString(), id); int actualCount = recipe.getAsJsonObject("result").has("count") ? recipe.getAsJsonObject("result").get("count").getAsInt() : 1; @@ -631,7 +631,7 @@ private static void assertCookingRecipe(String id, String type, String ingredien int actualCount; if (resultElement.isJsonObject()) { JsonObject resultObject = resultElement.getAsJsonObject(); - actualItem = resultObject.get("item").getAsString(); + actualItem = resultObject.get("id").getAsString(); actualCount = resultObject.has("count") ? resultObject.get("count").getAsInt() : 1; } else { actualItem = resultElement.getAsString(); @@ -644,7 +644,7 @@ private static void assertCookingRecipe(String id, String type, String ingredien private static void assertRecipeResult(String id, String item, int count) throws Exception { JsonObject recipe = read(resource("data/basemetals/recipes/" + id + ".json")).getAsJsonObject(); JsonObject result = recipe.getAsJsonObject("result"); - assertEquals(item, result.get("item").getAsString(), id); + assertEquals(item, result.get("id").getAsString(), id); assertEquals(count, result.has("count") ? result.get("count").getAsInt() : 1, id); } 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 c2572234b..56b504510 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldDataHookTest.java @@ -14,6 +14,18 @@ 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'")); + } + @Test void obsoleteVanillaBiomeSnapshotIsRemovedWithoutChangingSavedBiomesOrOtherRegistries() { CompoundTag root = biomeSnapshot("minecraft:plains", "minecraft:mountains"); @@ -177,14 +189,14 @@ void terrainGuardProtectsSavedChunksButAllowsNewUnderground() throws IOException locations[3] = 1; Files.write(region, locations); assertEquals(1, LegacyWorldDataHook.indexLegacyChunks(world.toFile())); - ResourceLocation overworld = new ResourceLocation("minecraft:overworld"); + ResourceLocation overworld = ResourceLocation.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(new ResourceLocation("minecraft:the_nether"), + assertFalse(LegacyWorldDataHook.isProtectedChunk(ResourceLocation.parse("minecraft:the_nether"), new BlockPos(1, 64, 1))); } diff --git a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldSourceTest.java b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldSourceTest.java index 337d46862..a9571b65c 100644 --- a/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldSourceTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/migration/LegacyWorldSourceTest.java @@ -54,6 +54,6 @@ private void writeLevel(String name, int dataVersion, int blockId, String blockN level.put("FML", fml); level.put("Data", data); - NbtIo.writeCompressed(level, temporaryWorld.resolve(name).toFile()); + NbtIo.writeCompressed(level, temporaryWorld.resolve(name)); } } 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 b09d09aa1..7f2a9a39d 100644 --- a/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/network/ConnectionReadInterestTest.java @@ -1,179 +1,34 @@ package zone.moddev.mc.basemetals.network; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.nio.channels.SelectionKey; +import static org.junit.jupiter.api.Assertions.*; import java.nio.file.Files; import java.nio.file.Path; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; - -import io.netty.bootstrap.Bootstrap; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.SocketChannel; -import io.netty.channel.socket.DefaultSocketChannelConfig; -import io.netty.channel.socket.nio.NioSocketChannel; import org.junit.jupiter.api.Test; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; +/** Forge 50 owns protocol transitions; Base Metals only checks its own content mode. */ class ConnectionReadInterestTest { - private static final Path PATCH = Path.of("src/main/resources/coremods/connection_read_interest.js"); - - @Test - void protocolReadChangesStayOnTheEventLoop() throws Exception { - ClassNode connection = connectionClass(); - assertEquals(1, autoReadCalls(method(connection, "sendPacket"))); - assertEquals(0, autoReadCalls(method(connection, "doSendPacket"))); - - transform(connection); - - assertEquals(0, autoReadCalls(method(connection, "sendPacket"))); - assertEquals(1, autoReadCalls(method(connection, "doSendPacket"))); - assertTrue(Files.readString(Path.of("src/main/resources/META-INF/coremods.json")) - .contains("coremods/connection_read_interest.js")); - } - @Test - void applyingThePatchTwiceDoesNotDuplicateTheReadChange() throws Exception { - ClassNode connection = connectionClass(); - transform(connection); - transform(connection); - - assertEquals(0, autoReadCalls(method(connection, "sendPacket"))); - assertEquals(1, autoReadCalls(method(connection, "doSendPacket"))); + 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")); } @Test - void anUnexpectedMinecraftMethodFailsClearly() throws Exception { - ClassNode connection = connectionClass(); - method(connection, "doSendPacket").desc = "()V"; - assertThrows(ScriptException.class, () -> transform(connection)); + void bothDirectionsUseTheConfigurationPhase() throws Exception { + String source = Files.readString(Path.of( + "src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java")); + assertTrue(source.contains("NetworkDirection.CONFIGURATION_TO_CLIENT")); + assertTrue(source.contains("NetworkDirection.CONFIGURATION_TO_SERVER")); + assertTrue(source.contains("listener.finishCurrentTask(TASK)")); + assertFalse(source.contains("HandshakeHandler")); + assertFalse(source.contains("SimpleConfigurationTask")); } @Test - void serializingAutoReadChangesPreventsTheLostReadInterest() throws Exception { - NioEventLoopGroup group = new NioEventLoopGroup(1); - DelayedReadChannel channel = new DelayedReadChannel(); - - try (ServerSocket listener = new ServerSocket(0)) { - new Bootstrap().group(group).channelFactory(() -> channel) - .handler(new ChannelInitializer() { - @Override - protected void initChannel(SocketChannel socket) {} - }).connect(new InetSocketAddress("127.0.0.1", listener.getLocalPort())).sync(); - - try (var peer = listener.accept()) { - channel.eventLoop().submit(() -> {}).sync(); - assertTrue((channel.readInterest() & SelectionKey.OP_READ) != 0); - - // Pause the off-thread disable after the flag changes, but before Netty clears OP_READ. - channel.delayClear = true; - Thread sender = new Thread(() -> channel.config().setAutoRead(false)); - sender.start(); - assertTrue(channel.clearing.await(5, TimeUnit.SECONDS)); - channel.eventLoop().submit(() -> channel.config().setAutoRead(true)).sync(); - channel.releaseClear.countDown(); - sender.join(5000); - channel.eventLoop().submit(() -> {}).sync(); - - assertTrue(channel.config().isAutoRead()); - assertEquals(0, channel.readInterest() & SelectionKey.OP_READ, - "The original off-thread disable can erase the newer read request"); - - channel.delayClear = false; - channel.eventLoop().submit(() -> { - channel.config().setAutoRead(false); - channel.config().setAutoRead(true); - }).sync(); - - assertTrue((channel.readInterest() & SelectionKey.OP_READ) != 0, - "Changing both flags on the event loop must leave reads enabled"); - } - } finally { - channel.releaseClear.countDown(); - channel.close().sync(); - group.shutdownGracefully(0, 5, TimeUnit.SECONDS).sync(); - } - } - - private static ClassNode connectionClass() throws Exception { - try (var bytes = ConnectionReadInterestTest.class.getClassLoader() - .getResourceAsStream("net/minecraft/network/Connection.class")) { - assertNotNull(bytes); - ClassNode node = new ClassNode(); - new ClassReader(bytes).accept(node, 0); - return node; - } - } - - private static MethodNode method(ClassNode node, String name) { - return node.methods.stream().filter(method -> method.name.equals(name)).findFirst().orElseThrow(); - } - - private static long autoReadCalls(MethodNode method) { - long count = 0; - for (var instruction : method.instructions) { - if (instruction instanceof MethodInsnNode call && call.name.equals("setAutoRead")) { - ++count; - } - } - return count; - } - - private static void transform(ClassNode node) throws Exception { - ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn"); - assertNotNull(engine); - String script = Files.readString(PATCH).replace( - "Java.type('net.minecraftforge.coremod.api.ASMAPI')", - "({mapMethod: function(name) { return ({m_129520_: 'sendPacket', " - + "m_243087_: 'doSendPacket', m_129498_: 'setProtocol'})[name] || name; }})"); - engine.eval(script); - engine.put("connection", node); - engine.eval("initializeCoreMod().basemetals_connection_read_interest.transformer(connection)"); - } - - private static final class DelayedReadChannel extends NioSocketChannel { - private final CountDownLatch clearing = new CountDownLatch(1); - private final CountDownLatch releaseClear = new CountDownLatch(1); - private volatile boolean delayClear; - private final DefaultSocketChannelConfig config = new DefaultSocketChannelConfig(this, javaChannel().socket()) { - @Override - protected void autoReadCleared() { - if (delayClear) { - clearing.countDown(); - try { - if (!releaseClear.await(5, TimeUnit.SECONDS)) { - throw new IllegalStateException("Timed out arranging the read-interest race"); - } - } catch (InterruptedException interrupted) { - Thread.currentThread().interrupt(); - throw new IllegalStateException(interrupted); - } - } - clearReadPending(); - } - }; - - @Override - public DefaultSocketChannelConfig config() { - return config; - } - - int readInterest() { - return selectionKey().interestOps(); - } + void legacyDefaultsAndExplicitHighFantasyAreEquivalent() { + assertTrue(ContentModeNetwork.modesMatch(null, "high_fantasy")); + assertTrue(ContentModeNetwork.modesMatch("low_fantasy", "low_fantasy")); + assertFalse(ContentModeNetwork.modesMatch("low_fantasy", "high_fantasy")); } } 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 1c4c28e75..63f019564 100644 --- a/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java +++ b/src/upgradeSmoke/java/zone/moddev/mc/basemetals/smoke/UpgradeWorldSmoke.java @@ -140,7 +140,8 @@ public static void onServerStarted(ServerStartedEvent event) { String actual = String.valueOf(ForgeRegistries.ITEMS.getKey(stack.getItem())); 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.getOrCreateTagElement("basemetals_fixture") + 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()); boolean enchantmentMatches = !oldItem.has("enchanted") || !oldItem.get("enchanted").getAsBoolean() || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, stack) == 2; @@ -170,7 +171,8 @@ public static void onServerStarted(ServerStartedEvent event) { ItemStack worn = stand.getItemBySlot(equipmentSlot); return expected.equals(String.valueOf(ForgeRegistries.ITEMS.getKey(worn.getItem()))) && worn.getDamageValue() == expectedDamage - && worn.getOrCreateTagElement("basemetals_fixture").getString("proof") + && worn.getOrDefault(net.minecraft.core.component.DataComponents.CUSTOM_DATA, + net.minecraft.world.item.component.CustomData.EMPTY).copyTag().getCompound("basemetals_fixture").getString("proof") .equals(oldItem.get("id").getAsString()) && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, worn) == 2; }); @@ -210,8 +212,9 @@ public static void onServerStarted(ServerStartedEvent event) { String name = savedPlayer.has("name") ? savedPlayer.get("name").getAsString() : "BaseMetalsFixture"; ServerPlayer player = new ServerPlayer(event.getServer(), overworld, - new GameProfile(UUID.fromString(savedPlayer.get("uuid").getAsString()), name)); - CompoundTag loaded = event.getServer().getPlayerList().load(player); + new GameProfile(UUID.fromString(savedPlayer.get("uuid").getAsString()), name), + net.minecraft.server.level.ClientInformation.createDefault()); + CompoundTag loaded = event.getServer().getPlayerList().load(player).orElse(null); if (loaded == null) { failures.add("fixture playerdata did not load"); continue; @@ -221,7 +224,8 @@ public static void onServerStarted(ServerStartedEvent event) { int slot = expectedItem.get("slot").getAsInt(); ItemStack stack = player.getInventory().getItem(slot); String expected = currentItemId(expectedItem.get("id").getAsString()); - boolean proof = stack.getOrCreateTagElement("basemetals_fixture") + 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()); if (!expected.equals(String.valueOf(ForgeRegistries.ITEMS.getKey(stack.getItem()))) || !proof) { @@ -304,12 +308,13 @@ private static void verifySavedAdvancements(net.minecraft.server.MinecraftServer Path fixtureFile = root.resolve("basemetals_advancement_upgrade_fixture.json"); if (!Files.isRegularFile(fixtureFile)) return; JsonObject fixture = JsonParser.parseString(Files.readString(fixtureFile)).getAsJsonObject(); - var player = net.minecraftforge.common.util.FakePlayerFactory.get(world, - new GameProfile(UUID.fromString(fixture.get("uuid").getAsString()), "UpgradeProgress")); + var player = new ServerPlayer(server, world, + new GameProfile(UUID.fromString(fixture.get("uuid").getAsString()), "UpgradeProgress"), + net.minecraft.server.level.ClientInformation.createDefault()); int retained = 0; for (var entry : fixture.getAsJsonObject("progress").entrySet()) { if ("DataVersion".equals(entry.getKey())) continue; - var advancement = server.getAdvancements().getAdvancement(new ResourceLocation(entry.getKey())); + var advancement = server.getAdvancements().get(ResourceLocation.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()); @@ -360,7 +365,7 @@ private static ServerLevel level(ServerStartedEvent event, int dimension) { } private static String currentBlockId(String legacy) { - ResourceLocation id = new ResourceLocation(legacy.toLowerCase(java.util.Locale.ROOT)); + ResourceLocation id = ResourceLocation.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()); } @@ -368,7 +373,7 @@ private static String currentBlockId(String legacy) { } private static String currentItemId(String legacy) { - ResourceLocation id = new ResourceLocation(legacy.toLowerCase(java.util.Locale.ROOT)); + ResourceLocation id = ResourceLocation.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 43e3d5418..1e4b4f8ff 100644 --- a/tools/validation/README.md +++ b/tools/validation/README.md @@ -1,11 +1,11 @@ # World upgrade checks -`test_legacy_worlds.js` starts the packaged Forge 1.20.1 server against a fresh +`test_legacy_worlds.js` starts the packaged Forge 1.20.6 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. -Pass a local JSON specification containing `java17`, `serverRuntime`, `output`, +Pass a local JSON specification containing `java` (the Java 21 executable), `serverRuntime`, `output`, `modJar`, `probeJar`, `oreSpawn` (a `path` and `sha256`), and a `profiles` list. Each profile needs an `id`, `world` path and expected log `marker`. Captured fixtures include a registry manifest so the probe can check each block state, @@ -14,6 +14,10 @@ Keep machine-specific specifications and test output outside the checkout. For fresh-world compatibility checks, set `fresh:true` and `fixture:false`. Optional `extraMods`, `contentMode`, `dataPacks` and JVM `properties` let the same runner check installed integrations and explicit data-pack overrides. +Use `lateChunks:true` on captured fixtures to leave Nether and End blocks +unopened through the first load and reload, then check them on a third start. +`oreOverrides` edits named Base Metals rules in the disposable world's saved +OreSpawn profile and verifies that those values survive both starts. `compare_world_terrain.py` checks fixed vanilla terrain before and after conversion. It accepts Minecraft's new underground floor and accounts for @@ -24,6 +28,8 @@ palette readers and falling-block comparison. `compare_current_world.py` compares Base Metals block states, stored items, equipment and advancement progress in flattened saves. It reads both older chunk entity lists and the separate entity files used by newer Minecraft. +Item comparisons account for the component conversion while still checking +damage, enchantments, names, lore and custom data. Flying projectiles are excluded from the static item count because they can hit targets during the test; their ammunition save/load and pickup behaviour are covered by the runtime tests. Run all comparison-tool regressions with @@ -33,9 +39,10 @@ are covered by the runtime tests. Run all comparison-tool regressions with `test_content_modes.js` launches a separate client and server for each case. It checks unchanged older configs, missing configs, matching Low Fantasy modes, -and both kinds of mismatch. Existing gameplay switches must keep their values. +and both kinds of mismatch. Matching clients disconnect and rejoin three times +to check repeated connections. Existing gameplay switches must keep their values. -Its local specification needs `java17`, `serverRuntime`, `clientRuntime`, +Its local specification needs `java` (the Java 21 executable), `serverRuntime`, `clientRuntime`, `output`, `modJar`, `serverProbe`, `clientProbe`, and the same checksum-pinned `oreSpawn` object used by the world tests. The test uses localhost only and chooses a free port; no public Minecraft server is involved. diff --git a/tools/validation/compare_current_world.py b/tools/validation/compare_current_world.py index 71a3e1d5d..2b9ce4eee 100644 --- a/tools/validation/compare_current_world.py +++ b/tools/validation/compare_current_world.py @@ -39,6 +39,62 @@ def ordered(tag): return tag +def canonical_text(value): + 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 canonical_stack(stack): + """Compare saved item data across the 1.20.5 component conversion.""" + result = nbtlib.Compound(copy.deepcopy(stack)) + result["count"] = nbtlib.Int(int(result.pop("Count", result.get("count", 1)))) + components = result.pop("components", nbtlib.Compound()) + legacy = result.pop("tag", nbtlib.Compound()) + + for old, new in (("Damage", "minecraft:damage"), ("RepairCost", "minecraft:repair_cost")): + if old in legacy: + components[new] = nbtlib.Int(int(legacy.pop(old))) + if new in components and not int(components[new]): + components.pop(new) + + display = legacy.pop("display", nbtlib.Compound()) + if "Name" in display: + components["minecraft:custom_name"] = display.pop("Name") + if "Lore" in display: + components["minecraft:lore"] = display.pop("Lore") + if display: + legacy["display"] = display + if "minecraft:custom_name" in components: + components["minecraft:custom_name"] = canonical_text(components["minecraft:custom_name"]) + if "minecraft:lore" in components: + components["minecraft:lore"] = nbtlib.List[nbtlib.String]( + canonical_text(line) for line in components["minecraft:lore"]) + + for old, new in (("Enchantments", "minecraft:enchantments"), + ("StoredEnchantments", "minecraft:stored_enchantments")): + if old in legacy: + levels = nbtlib.Compound({str(entry["id"]): nbtlib.Int(int(entry["lvl"])) for entry in legacy.pop(old)}) + components[new] = nbtlib.Compound({"levels": levels}) + if new in components: + enchantments = components[new] + if bool(enchantments.get("show_in_tooltip", False)): + enchantments.pop("show_in_tooltip") + if not enchantments.get("levels"): + components.pop(new) + + if legacy: + components["minecraft:custom_data"] = legacy + if components: + result["components"] = components + return ordered(result).snbt() + + def snapshot(world): blocks = {} stacks = Counter() @@ -50,8 +106,8 @@ def items(value): # round-trip is covered separately; saved inventories must stay intact. if identifier in ('basemetals:custom_arrow', 'basemetals:custom_bolt') and not value.get('inGround', False): return - if str(value.get("id", "")).startswith("basemetals:") and "Count" in value: - stacks[ordered(value).snbt()] += 1 + if str(value.get("id", "")).startswith("basemetals:") and ("Count" in value or "count" in value): + stacks[canonical_stack(value)] += 1 return for child in value.values(): items(child) diff --git a/tools/validation/compare_world_terrain.py b/tools/validation/compare_world_terrain.py index 6f5e24a02..9987fba44 100644 --- a/tools/validation/compare_world_terrain.py +++ b/tools/validation/compare_world_terrain.py @@ -203,7 +203,11 @@ def compare(original, upgraded): original_sections[int(section["Y"])] = list(block_names(section)) for height in original_sections.keys() | sections.keys(): actual = sections.get(height, [None] * 4096) - for index, expected in enumerate(original_sections.get(height, [None] * 4096)): + expected_section = original_sections.get(height, [None] * 4096) + if actual == expected_section: + checked += sum(name in TERRAIN_NAMES for name in expected_section) + continue + for index, expected in enumerate(expected_section): x = key[1] * 16 + (index & 15) + 0.5 y = height * 16 + (index >> 8) z = key[2] * 16 + ((index >> 4) & 15) + 0.5 diff --git a/tools/validation/forge_launcher.js b/tools/validation/forge_launcher.js index faf03c466..9dbeff7a3 100644 --- a/tools/validation/forge_launcher.js +++ b/tools/validation/forge_launcher.js @@ -17,6 +17,20 @@ function serverArguments(runtime, directory, version, forge) { if (line.startsWith('-D') && line.includes(libraries)) return '"' + line + '"'; return line; }).join('\n'); + const shim = `forge-${version}-${forge}-shim.jar`; + if (fs.existsSync(path.join(runtime, shim))) { + fs.copyFileSync(path.join(runtime, shim), path.join(directory, shim)); + for (const source of fs.readdirSync(path.join(runtime, 'libraries'), { recursive: true, withFileTypes: true })) { + if (!source.isFile()) continue; + const file = path.join(source.parentPath || source.path, source.name); + const target = path.join(directory, 'libraries', path.relative(path.join(runtime, 'libraries'), file)); + fs.mkdirSync(path.dirname(target), { recursive: true }); + if (!fs.existsSync(target)) { + try { fs.linkSync(file, target); } + catch { fs.copyFileSync(file, target); } + } + } + } const staged = path.join(directory, 'forge-arguments.txt'); fs.writeFileSync(staged, contents); return ['--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED', '@' + staged, 'nogui']; diff --git a/tools/validation/test_component_comparison.py b/tools/validation/test_component_comparison.py new file mode 100644 index 000000000..5ca6f8159 --- /dev/null +++ b/tools/validation/test_component_comparison.py @@ -0,0 +1,31 @@ +"""Checks that the save comparison keeps item data strict across components.""" + +import copy +import unittest +import nbtlib +from compare_current_world import canonical_stack + + +class ComponentComparisonTest(unittest.TestCase): + 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"}']}, + Enchantments:[{id:"minecraft:unbreaking",lvl:2s}],Proof:47}}''') + native = nbtlib.parse_nbt('''{id:"basemetals:steel_sword",count:1,Slot:2b,components:{ + "minecraft:damage":19,"minecraft:custom_name":"Old sword","minecraft:lore":["A keepsake"], + "minecraft:enchantments":{levels:{"minecraft:unbreaking":2}},"minecraft:custom_data":{Proof:47}}}''') + self.assertEqual(canonical_stack(legacy), canonical_stack(native)) + + for key in list(native['components']): + changed = copy.deepcopy(native) + changed['components'].pop(key) + self.assertNotEqual(canonical_stack(legacy), canonical_stack(changed), key) + + def test_unknown_component_and_custom_nbt_are_not_ignored(self): + original = nbtlib.parse_nbt('{id:"basemetals:steel_arrow",count:1,components:{"example:data":{value:9b}}}') + changed = nbtlib.parse_nbt('{id:"basemetals:steel_arrow",count:1,components:{"example:data":{value:9}}}') + self.assertNotEqual(canonical_stack(original), 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 ae3d8505d..9f528766f 100644 --- a/tools/validation/test_content_modes.js +++ b/tools/validation/test_content_modes.js @@ -49,7 +49,7 @@ function prepare(directory, mode, probe) { function launch(directory, args, filename) { const stream = fs.createWriteStream(path.join(directory, filename)); - const child = spawn(spec.java17, args, { cwd: directory, windowsHide: true }); + const child = spawn((spec.java || spec.java17), args, { cwd: directory, windowsHide: true }); const state = { child, log: '', done: false, code: null }; for (const pipe of [child.stdout, child.stderr]) pipe.on('data', data => { stream.write(data); @@ -94,7 +94,7 @@ function verifyConfig(directory, initial) { (async () => { const results = []; - const client = clientLaunch(spec.clientRuntime, '1.20.1', '47.4.10'); + const client = clientLaunch(spec.clientRuntime, '1.20.6', '50.2.0'); const selected = spec.cases ? cases.filter(([name]) => spec.cases.includes(name)) : cases; if (!selected.length || (spec.cases && selected.length !== spec.cases.length)) { throw new Error('The requested mode-test case is unknown or duplicated.'); @@ -114,14 +114,14 @@ function verifyConfig(directory, initial) { + 'generator-settings={"layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:dirt","height":2},{"block":"minecraft:grass_block","height":1}],"biome":"minecraft:plains"}\n' + 'generate-structures=false\nmax-tick-time=-1\n'); const server = launch(serverDir, ['-Xms256m', '-Xmx2g', '-Dbasemetals.awaitLoginSmoke=true', - ...serverArguments(spec.serverRuntime, serverDir, '1.20.1', '47.4.10')], 'server.log'); + ...serverArguments(spec.serverRuntime, serverDir, '1.20.6', '50.2.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.expectModeReject=${!!reject}`, + `-Dbasemetals.remoteAddress=127.0.0.1:${port}`, `-Dbasemetals.loginSmokeConnections=${reject ? 1 : 3}`, `-Dbasemetals.expectModeReject=${!!reject}`, ...client.args, ...client.metadata.arguments.game, - '--username', 'BMValidation', '--version', '1.20.1', '--gameDir', clientDir, + '--username', 'BMValidation', '--version', '1.20.6', '--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 b279fa91a..91bd997c9 100644 --- a/tools/validation/test_legacy_worlds.js +++ b/tools/validation/test_legacy_worlds.js @@ -68,6 +68,11 @@ function checkUpgradeLog(log) { // Forge reports these removed vanilla names when it reads an older registry snapshot. const retiredVanillaEntries = new Set([ 'minecraft:grass_path', + // These names were changed by vanilla's 1.20.5 data fixes. + 'minecraft:grass', 'minecraft:scute', 'minecraft:sweeping', 'minecraft:empty', + 'minecraft:entity.parrot.imitate.enderman', 'minecraft:entity.parrot.imitate.panda', + 'minecraft:entity.parrot.imitate.polar_bear', 'minecraft:entity.parrot.imitate.wolf', + 'minecraft:entity.parrot.imitate.zombie_pigman', 'minecraft:zombie_pigman', 'minecraft:zombie_pigman_spawn_egg', 'minecraft:golem_last_seen_time', 'minecraft:opened_doors', 'minecraft:nitwit', 'minecraft:unemployed', @@ -125,9 +130,9 @@ function checkUpgradeLog(log) { async function run(directory, launcher, label, marker, properties = []) { console.log('Starting ' + label); const output = fs.createWriteStream(path.join(directory, label + '.log')); - const executable = phase === 'capture' ? spec.java8 : spec.java17; + const executable = phase === 'capture' ? spec.java8 : (spec.java || spec.java17); const launchArguments = phase === 'capture' ? ['-jar', launcher, 'nogui'] - : serverArguments(spec.serverRuntime, directory, '1.20.1', '47.4.10'); + : serverArguments(spec.serverRuntime, directory, '1.20.6', '50.2.0'); const child = spawn(executable, ['-Xms256m', '-Xmx2g', ...properties, ...launchArguments], { cwd: directory, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] }); child.stdout.pipe(output, { end: false }); @@ -178,6 +183,17 @@ async function run(directory, launcher, label, marker, properties = []) { prepare(directory, spec.serverRuntime, launcher, [spec.modJar, spec.probeJar, spec.oreSpawn, ...(profile.extraMods || [])]); if (!profile.fresh) fs.cpSync(source, path.join(directory, 'world'), { recursive: true }); + let expectedOreRules; + const oreProfileFile = path.join(directory, 'world/serverconfig/orespawn-worldgen.json'); + if (profile.oreOverrides) { + const geology = JSON.parse(fs.readFileSync(oreProfileFile, 'utf8')); + for (const [id, values] of Object.entries(profile.oreOverrides)) { + if (!id.startsWith('basemetals:') || !geology.ores[id]) throw new Error('Unknown fixture ore: ' + id); + Object.assign(geology.ores[id], values); + } + expectedOreRules = JSON.stringify(geology.ores); + fs.writeFileSync(oreProfileFile, JSON.stringify(geology, null, 2) + '\n'); + } if (profile.contentMode) { if (!['high_fantasy', 'low_fantasy'].includes(profile.contentMode)) { throw new Error('Invalid fixture content mode: ' + profile.contentMode); @@ -198,10 +214,34 @@ async function run(directory, launcher, label, marker, properties = []) { fs.copyFileSync(profile.advancementFixture, path.join(world, 'basemetals_advancement_upgrade_fixture.json')); } + const manifestFile = path.join(directory, 'world/legacy_registry_manifest_runtime.json'); + let fullManifest; + if (profile.lateChunks && fs.existsSync(manifestFile)) { + fullManifest = fs.readFileSync(manifestFile); + const early = JSON.parse(fullManifest); + let deferred = 0; + for (const block of early.blocks) { + const states = block.states.filter(state => (state.dimension || 0) === 0); + deferred += block.states.length - states.length; + block.states = states; + } + if (!deferred) throw new Error('The late-chunk fixture has no saved Nether or End blocks'); + fs.writeFileSync(manifestFile, JSON.stringify(early, null, 2) + '\n'); + results.push(profile.id + ' deferred_dimension_states=' + deferred); + } const properties = profile.fixture === false ? [] : ['-Dbasemetals.upgradeWorldSmoke=true']; properties.push(...(profile.properties || [])); results.push(...await run(directory, launcher, 'upgrade-first', profile.marker, properties)); results.push(...await run(directory, launcher, 'upgrade-reload', profile.marker, properties)); + if (fullManifest) { + fs.writeFileSync(manifestFile, fullManifest); + results.push(...await run(directory, launcher, 'upgrade-later-chunks', profile.marker, properties)); + } + if (expectedOreRules) { + const actual = JSON.stringify(JSON.parse(fs.readFileSync(oreProfileFile, 'utf8')).ores); + if (actual !== expectedOreRules) throw new Error('The explicit ore-rule overrides changed'); + results.push(profile.id + ' explicit_ore_overrides=unchanged'); + } const after = profile.fresh ? null : treeDigest(source); if (before !== after) throw new Error('Source fixture changed: ' + source); if (!profile.fresh) results.push(profile.id + ' source_sha256=' + before + ' unchanged=true'); diff --git a/tools/validation/test_packaged_client_runtime.py b/tools/validation/test_packaged_client_runtime.py new file mode 100644 index 000000000..b2cfa3d14 --- /dev/null +++ b/tools/validation/test_packaged_client_runtime.py @@ -0,0 +1,35 @@ +"""Keep the packaged-client helper aligned with the pinned build target.""" + +import importlib.util +from pathlib import Path +import unittest + + +PROJECT = Path(__file__).resolve().parents[2] +SPEC = importlib.util.spec_from_file_location( + "packaged_client_runtime", PROJECT / "gradle/prepare-forge-client-runtime.py") +HELPER = importlib.util.module_from_spec(SPEC) +SPEC.loader.exec_module(HELPER) + + +class PackagedClientTargetTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + lines = (PROJECT / "gradle.properties").read_text(encoding="utf-8").splitlines() + cls.properties = dict( + line.split("=", 1) for line in lines + if line and not line.startswith("#") and "=" in line) + + def test_minecraft_version_matches_the_project(self): + self.assertEqual(self.properties["minecraft_version"], HELPER.MINECRAFT_VERSION) + + def test_forge_version_matches_the_project(self): + self.assertEqual(self.properties["forge_version"], HELPER.FORGE_VERSION) + + def test_installer_checksum_matches_the_project(self): + self.assertEqual(self.properties["forge_installer_sha256"].lower(), + HELPER.FORGE_INSTALLER_SHA256) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/validation/test_world_terrain.py b/tools/validation/test_world_terrain.py index 3df860cc1..562710f78 100644 --- a/tools/validation/test_world_terrain.py +++ b/tools/validation/test_world_terrain.py @@ -41,6 +41,16 @@ def gravel(x=0.5, y=35, z=0.5, dimension=""): class FallingTerrainTest(unittest.TestCase): + def test_identical_sections_still_count_every_solid_block(self): + chunks = {("", 0, 0): {"Sections": [{"Y": 0, "Palette": [{"Name": "minecraft:stone"}]}]}} + with ( + patch.object(terrain, "chunks", side_effect=[chunks, chunks]), + patch.object(terrain, "falling_blocks", return_value={}), + patch("builtins.print") as message, + ): + terrain.compare(Path("source"), Path("copy")) + self.assertIn("solid_blocks=4096", message.call_args.args[0]) + def test_landed_block_is_recovered(self): terrain.match_fallen_blocks([gravel()], [gravel(y=20)])